Wed, 02 Jun 2010 16:53:38 +0200 laurent changes merged