Merge commit 'refs/remotes/origin/5.1'
Yann Collette [Mon, 6 Jul 2009 11:12:10 +0000 (13:12 +0200)]

Trivial merge