Merge remote branch 'origin/platal-1.0.0'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 10 Oct 2010 09:24:53 +0000 (11:24 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 10 Oct 2010 09:24:53 +0000 (11:24 +0200)

Trivial merge