Merge commit 'origin/master' into fusionax
authorStéphane Jacob <jacou@melix.net>
Mon, 16 Feb 2009 00:59:04 +0000 (01:59 +0100)
committerStéphane Jacob <jacou@melix.net>
Mon, 16 Feb 2009 00:59:04 +0000 (01:59 +0100)

Trivial merge