Merge commit 'origin/platal-0.10.0'
authorStéphane Jacob <jacou@melix.net>
Thu, 18 Dec 2008 14:00:42 +0000 (15:00 +0100)
committerStéphane Jacob <jacou@melix.net>
Thu, 18 Dec 2008 14:00:42 +0000 (15:00 +0100)

Trivial merge