Merge commit 'origin/platal-0.10.2'
authorStéphane Jacob <sj@m4x.org>
Sun, 13 Dec 2009 17:49:06 +0000 (18:49 +0100)
committerStéphane Jacob <sj@m4x.org>
Sun, 13 Dec 2009 17:49:06 +0000 (18:49 +0100)

Trivial merge