Merge commit 'origin/5.2'
Pierre MARECHAL [Tue, 5 Jan 2010 11:22:25 +0000 (12:22 +0100)]

Trivial merge