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