Merge commit 'origin/upstream-svn' into upstream
authorGilles Filippini <gilles.filippini@free.fr>
Mon, 4 May 2009 12:07:54 +0000 (14:07 +0200)
committerGilles Filippini <gilles.filippini@free.fr>
Mon, 4 May 2009 12:07:54 +0000 (14:07 +0200)

Trivial merge