Merge commit 'origin/master' into fusionax
authorPascal Corpet <pascal.corpet@m4x.org>
Tue, 22 Jul 2008 21:12:22 +0000 (23:12 +0200)
committerPascal Corpet <pascal.corpet@m4x.org>
Tue, 22 Jul 2008 21:12:22 +0000 (23:12 +0200)

Trivial merge