Merge branch 'upstream'
authorGilles Filippini <gilles.filippini@free.fr>
Sun, 3 May 2009 08:30:20 +0000 (10:30 +0200)
committerGilles Filippini <gilles.filippini@free.fr>
Sun, 3 May 2009 08:30:20 +0000 (10:30 +0200)

Trivial merge