Mon, 16 May 2011 12:41:23 +0200Merged with Edouard's modifications
laurent [Mon, 16 May 2011 12:41:23 +0200] rev 602
Merged with Edouard's modifications