Merge commit 'origin/5.1'
Vincent COUVERT [Mon, 6 Jul 2009 12:22:41 +0000 (14:22 +0200)]

Trivial merge