Merge commit 'origin/5.1'
Pierre MARECHAL [Fri, 3 Jul 2009 05:59:34 +0000 (07:59 +0200)]

Trivial merge