Mon, 02 Nov 2009 18:11:53 +0100 edouard Merge with 762497a95b7a0e2e500e428feb5008af98a6796c