Merge commit 'origin/platal-0.10.1'
authorStéphane Jacob <sj@m4x.org>
Tue, 25 Aug 2009 22:13:45 +0000 (00:13 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 25 Aug 2009 22:13:45 +0000 (00:13 +0200)

Trivial merge