Sun, 27 Mar 2011 16:16:55 +0200 laurent Merged with Edouard's modifications