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

Trivial merge