Merge branch 'upstream'
authorSamuel Mimram <smimram@debian.org>
Sun, 3 Feb 2008 19:49:32 +0000 (19:49 +0000)
committerSamuel Mimram <smimram@debian.org>
Sun, 3 Feb 2008 19:49:32 +0000 (19:49 +0000)

Trivial merge