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