Merge branch 'upstream'
authorSamuel Mimram <smimram@debian.org>
Mon, 18 Sep 2006 12:45:36 +0000 (12:45 +0000)
committerSamuel Mimram <smimram@debian.org>
Mon, 18 Sep 2006 12:45:36 +0000 (12:45 +0000)

Trivial merge