Merge branch 'upstream'
authorGilles Filippini <gilles.filippini@free.fr>
Thu, 24 Sep 2009 20:05:27 +0000 (22:05 +0200)
committerGilles Filippini <gilles.filippini@free.fr>
Thu, 24 Sep 2009 20:05:27 +0000 (22:05 +0200)

Trivial merge