Merge commit 'origin/platal-0.10.1'
authorStéphane Jacob <sj@m4x.org>
Fri, 30 Oct 2009 15:46:48 +0000 (16:46 +0100)
committerStéphane Jacob <sj@m4x.org>
Fri, 30 Oct 2009 15:46:48 +0000 (16:46 +0100)

Trivial merge