Merge commit 'origin/platal-0.10.0'
authorStéphane Jacob <jacou@melix.net>
Sat, 13 Dec 2008 17:22:45 +0000 (18:22 +0100)
committerStéphane Jacob <jacou@melix.net>
Sat, 13 Dec 2008 17:22:45 +0000 (18:22 +0100)

Trivial merge