Sat, 12 Mar 2011 18:43:02 +0100 laurent Merged with modifications from Edouard