Merge remote branch 'origin/platal-1.0.1'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 5 Nov 2010 22:15:23 +0000 (23:15 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 5 Nov 2010 22:15:23 +0000 (23:15 +0100)

Trivial merge