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

Trivial merge