Merge remote branch 'origin/platal-1.0.1'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 18 Oct 2010 21:19:29 +0000 (23:19 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 18 Oct 2010 21:19:29 +0000 (23:19 +0200)

Trivial merge