Tue, 27 Oct 2009 14:35:57 +0100 edouard Merge with daa1e1c3fba43ee73a2e827961155b1372ca433e