Merge branch 'platal-1.0.0'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 1 Jul 2010 08:35:43 +0000 (10:35 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 1 Jul 2010 08:35:43 +0000 (10:35 +0200)

Trivial merge