Merge commit 'origin/upstream-svn' into upstream
authorGilles Filippini <gilles.filippini@free.fr>
Mon, 23 Feb 2009 10:35:36 +0000 (11:35 +0100)
committerGilles Filippini <gilles.filippini@free.fr>
Mon, 23 Feb 2009 10:35:36 +0000 (11:35 +0100)

Trivial merge