Merge commit 'origin/platal-0.10.0'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 30 Dec 2008 22:28:57 +0000 (23:28 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 30 Dec 2008 22:28:57 +0000 (23:28 +0100)

Trivial merge