Merge commit 'refs/remotes/origin/5.1'
Yann COLLETTE [Mon, 16 Mar 2009 18:52:18 +0000 (19:52 +0100)]

Trivial merge