Tue, 10 Jan 2012 15:10:08 +0100 laurent Merge with Donggu modifications