Merge commit 'origin/platal-0.9.17'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 22 Jul 2008 19:20:52 +0000 (21:20 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 22 Jul 2008 19:20:52 +0000 (21:20 +0200)

Trivial merge