Wed, 16 Jun 2010 21:52:17 +0200 laurent merge