Thu, 13 Aug 2009 11:48:55 +0200 edouard Merge with 35cc4c6a29363d0a89f3e1096832cf14bb79f3de