Mon, 16 May 2011 12:36:21 +0200Merged with Edouard's modifications
laurent [Mon, 16 May 2011 12:36:21 +0200] rev 293
Merged with Edouard's modifications