Merge commit 'origin/master' into fusionax
authorStéphane Jacob <sj@m4x.org>
Mon, 20 Jul 2009 20:56:15 +0000 (22:56 +0200)
committerStéphane Jacob <sj@m4x.org>
Mon, 20 Jul 2009 20:56:15 +0000 (22:56 +0200)

Trivial merge