Wed, 13 Jul 2011 11:48:34 +0200 laurent Commiting merge with Mario's repository