Thu, 13 Aug 2009 11:37:38 +0200 edouard Merge with 75ae46b66315975b49ec48574befa094be583fdd