Merge remote branch 'origin/platal-1.0.1'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 30 Oct 2010 13:16:30 +0000 (15:16 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 30 Oct 2010 13:16:30 +0000 (15:16 +0200)

Trivial merge