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