Tue, 10 Jan 2012 15:10:08 +0100Merge with Donggu modifications
laurent [Tue, 10 Jan 2012 15:10:08 +0100] rev 2027
Merge with Donggu modifications