Tue, 27 Oct 2009 14:35:57 +0100Merge with daa1e1c3fba43ee73a2e827961155b1372ca433e
edouard [Tue, 27 Oct 2009 14:35:57 +0100] rev 610
Merge with daa1e1c3fba43ee73a2e827961155b1372ca433e