Tue, 17 Jan 2012 22:52:27 +0100Merging with modifications from Edouard
laurent [Tue, 17 Jan 2012 22:52:27 +0100] rev 667
Merging with modifications from Edouard