Mon, 07 Dec 2009 14:00:33 +0100merge
edouard [Mon, 07 Dec 2009 14:00:33 +0100] rev 471
merge