Merge remote branch 'origin/platal-1.0.0'
authorStéphane Jacob <sj@m4x.org>
Sat, 3 Jul 2010 15:56:51 +0000 (17:56 +0200)
committerStéphane Jacob <sj@m4x.org>
Sat, 3 Jul 2010 15:56:51 +0000 (17:56 +0200)

Trivial merge