Merge remote branch 'origin/platal-1.0.0'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 11 Oct 2010 12:54:07 +0000 (14:54 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 11 Oct 2010 12:54:07 +0000 (14:54 +0200)

Trivial merge