Merge commit 'origin/5.1'
Vincent COUVERT [Thu, 12 Feb 2009 10:32:25 +0000 (11:32 +0100)]

Trivial merge