Merge commit 'origin/platal-0.10.0'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 1 Feb 2009 13:26:08 +0000 (14:26 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 1 Feb 2009 13:26:08 +0000 (14:26 +0100)

Trivial merge