Merge commit 'origin/upstream-svn' into upstream
authorGilles Filippini <gilles.filippini@free.fr>
Mon, 30 Mar 2009 14:55:39 +0000 (16:55 +0200)
committerGilles Filippini <gilles.filippini@free.fr>
Mon, 30 Mar 2009 14:55:39 +0000 (16:55 +0200)

Trivial merge