Tue, 15 Dec 2009 10:06:01 +0100 laurent Changes merged