Mon, 04 Apr 2011 17:19:35 +0200Merge
Edouard Tisserant [Mon, 04 Apr 2011 17:19:35 +0200] rev 272
Merge