Fri, 04 Dec 2009 15:28:08 +0100 laurent Changes merged