merge with 5.1
Allan CORNET [Mon, 24 Aug 2009 04:17:22 +0000 (06:17 +0200)]

Trivial merge