Merge branch 'platal-0.9.17'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 30 Jun 2008 20:26:07 +0000 (22:26 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 30 Jun 2008 20:26:07 +0000 (22:26 +0200)

Trivial merge