Mon, 07 Dec 2009 14:44:58 +0100 laurent Changes merged