Merge branch 'upstream' into 3.08
authorSven Luther <luther@debian.org>
Mon, 12 Jul 2004 12:42:57 +0000 (12:42 +0000)
committerSven Luther <luther@debian.org>
Mon, 12 Jul 2004 12:42:57 +0000 (12:42 +0000)

Trivial merge