Sun, 27 Mar 2011 16:19:36 +0200Merged with Edouard's modifications
laurent [Sun, 27 Mar 2011 16:19:36 +0200] rev 253
Merged with Edouard's modifications