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

Trivial merge