Merge branch 'upstream'
authorSven Luther <luther@debian.org>
Tue, 18 Nov 2003 19:10:46 +0000 (19:10 +0000)
committerSven Luther <luther@debian.org>
Tue, 18 Nov 2003 19:10:46 +0000 (19:10 +0000)

Trivial merge