Merge commit 'origin/5.1'
Pierre MARECHAL [Wed, 29 Apr 2009 13:27:57 +0000 (15:27 +0200)]

Trivial merge