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

Trivial merge