Sat, 05 Dec 2009 18:53:01 +0100 laurent Changes merged