Merge branch 'upstream' into 3.08
authorSven Luther <luther@debian.org>
Wed, 14 Jul 2004 13:16:59 +0000 (13:16 +0000)
committerSven Luther <luther@debian.org>
Wed, 14 Jul 2004 13:16:59 +0000 (13:16 +0000)

Trivial merge