Merge branch 'upstream'
authorGilles Filippini <gilles.filippini@free.fr>
Wed, 9 Sep 2009 20:20:07 +0000 (22:20 +0200)
committerGilles Filippini <gilles.filippini@free.fr>
Wed, 9 Sep 2009 20:20:07 +0000 (22:20 +0200)

Trivial merge