Merge commit 'origin/upstream-svn' into upstream
authorGilles Filippini <gilles.filippini@free.fr>
Mon, 23 Mar 2009 14:53:52 +0000 (15:53 +0100)
committerGilles Filippini <gilles.filippini@free.fr>
Mon, 23 Mar 2009 14:53:52 +0000 (15:53 +0100)

Trivial merge