Mon, 02 Nov 2009 15:38:49 +0100 edouard Merge with 092060fd8afb1d950fe467724ce0209bddc48716