Thu, 08 Sep 2011 20:25:00 +0200 laurent Merge with 01068ccb73b202b2872d4117ad01984bac956cbb