Merge branch 'upstream'
authorGilles Filippini <gilles.filippini@free.fr>
Mon, 15 Jun 2009 14:12:44 +0000 (16:12 +0200)
committerGilles Filippini <gilles.filippini@free.fr>
Mon, 15 Jun 2009 14:12:44 +0000 (16:12 +0200)

Trivial merge