Fri, 07 Aug 2009 15:59:35 +0200 'Laurent Bessard Merged changes