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