Merge commit 'origin/upstream-svn' into upstream
authorGilles Filippini <gilles.filippini@free.fr>
Sun, 22 Mar 2009 19:33:32 +0000 (20:33 +0100)
committerGilles Filippini <gilles.filippini@free.fr>
Sun, 22 Mar 2009 19:33:32 +0000 (20:33 +0100)

Trivial merge