Merge commit 'origin/fusionax' into account
authorStéphane Jacob <sj@m4x.org>
Fri, 28 Aug 2009 09:33:55 +0000 (11:33 +0200)
committerStéphane Jacob <sj@m4x.org>
Fri, 28 Aug 2009 09:33:55 +0000 (11:33 +0200)

Trivial merge