Merge branch 'platal-0.9.15'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 6 Mar 2008 14:25:36 +0000 (15:25 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 6 Mar 2008 14:25:36 +0000 (15:25 +0100)

Trivial merge