Wed, 16 Dec 2009 15:09:12 +0100 laurent Changes merged