Merge commit 'origin/platal-0.10.0'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 16 Dec 2008 15:02:24 +0000 (16:02 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 16 Dec 2008 15:02:24 +0000 (16:02 +0100)

Trivial merge