Merge commit 'origin/upstream-svn' into upstream
authorGilles Filippini <gilles.filippini@free.fr>
Sun, 29 Mar 2009 10:29:36 +0000 (12:29 +0200)
committerGilles Filippini <gilles.filippini@free.fr>
Sun, 29 Mar 2009 10:29:36 +0000 (12:29 +0200)

Trivial merge