Merge commit 'origin/platal-0.10.0'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 12 Dec 2008 13:55:04 +0000 (14:55 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 12 Dec 2008 13:55:04 +0000 (14:55 +0100)

Trivial merge