Wed, 22 Aug 2012 16:46:17 +0200 Laurent Bessard Merge with c2546c6e0cfa5ad55b288895f17f1b9f2a228f3b