Merge branch 'platal-0.9.17' into hruid
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 15 Jun 2008 15:28:01 +0000 (17:28 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Sun, 15 Jun 2008 15:28:01 +0000 (17:28 +0200)

Trivial merge