Merge commit 'refs/remotes/origin/5.1'
Serge Steer [Tue, 18 Aug 2009 09:41:16 +0000 (11:41 +0200)]

Trivial merge