Merge remote branch 'origin/platal-1.0.1'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 28 Oct 2010 21:13:39 +0000 (23:13 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 28 Oct 2010 21:13:39 +0000 (23:13 +0200)

Trivial merge