Wed, 15 Feb 2012 00:44:24 +0100Merge with Edouard's Modifications
laurent [Wed, 15 Feb 2012 00:44:24 +0100] rev 684
Merge with Edouard's Modifications