Merge commit 'refs/remotes/origin/5.1'
Allan CORNET [Wed, 28 Jan 2009 13:44:48 +0000 (14:44 +0100)]

Trivial merge