Merge remote branch 'origin/platal-1.0.0'
authorStéphane Jacob <sj@m4x.org>
Sun, 4 Jul 2010 17:10:45 +0000 (19:10 +0200)
committerStéphane Jacob <sj@m4x.org>
Sun, 4 Jul 2010 17:10:45 +0000 (19:10 +0200)

Trivial merge