Merge branch 'platal-1.0.0'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 2 Jul 2010 08:30:53 +0000 (10:30 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 2 Jul 2010 08:30:53 +0000 (10:30 +0200)

Trivial merge