Mon, 17 Oct 2011 09:04:13 +0200Merging with Edouard's modifications
laurent [Mon, 17 Oct 2011 09:04:13 +0200] rev 628
Merging with Edouard's modifications