Mon, 16 May 2011 12:41:23 +0200 laurent Merged with Edouard's modifications