Merge remote branch 'origin/platal-1.0.0'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 22 Aug 2010 16:07:52 +0000 (18:07 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 22 Aug 2010 16:07:52 +0000 (18:07 +0200)

Trivial merge