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