Merge commit 'origin/upstream-svn' into upstream
authorGilles Filippini <gilles.filippini@free.fr>
Sun, 8 Mar 2009 21:00:34 +0000 (22:00 +0100)
committerGilles Filippini <gilles.filippini@free.fr>
Sun, 8 Mar 2009 21:00:34 +0000 (22:00 +0100)

Trivial merge