Sun, 27 Mar 2011 16:16:55 +0200Merged with Edouard's modifications
laurent [Sun, 27 Mar 2011 16:16:55 +0200] rev 586
Merged with Edouard's modifications