Merge commit 'origin/5.1'
Vincent COUVERT [Mon, 6 Jul 2009 15:51:40 +0000 (17:51 +0200)]

Trivial merge