Merge commit 'origin/platal-0.10.0'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 7 Feb 2009 00:20:52 +0000 (01:20 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 7 Feb 2009 00:20:52 +0000 (01:20 +0100)

Trivial merge