Thu, 31 Mar 2011 17:37:47 +0200 laurent Merged with Edouard's modifications