Merge commit 'origin/platal-0.10.0'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 28 Dec 2008 21:20:05 +0000 (22:20 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 28 Dec 2008 21:20:05 +0000 (22:20 +0100)

Trivial merge