Merge branch 'upstream'
authorGilles Filippini <gilles.filippini@free.fr>
Tue, 17 Nov 2009 20:35:39 +0000 (21:35 +0100)
committerGilles Filippini <gilles.filippini@free.fr>
Tue, 17 Nov 2009 20:35:39 +0000 (21:35 +0100)

Trivial merge