Merge commit 'origin/platal-0.10.2'
authorVincent Zanotti <vincent.zanotti@m4x.org>
Sun, 6 Dec 2009 01:13:34 +0000 (02:13 +0100)
committerVincent Zanotti <vincent.zanotti@m4x.org>
Sun, 6 Dec 2009 01:13:34 +0000 (02:13 +0100)

Trivial merge