Tue, 08 Nov 2011 22:39:44 +0100Merging with Edouard's modifications
laurent [Tue, 08 Nov 2011 22:39:44 +0100] rev 632
Merging with Edouard's modifications