Merge branch 'upstream'
authorSven Luther <luther@debian.org>
Sat, 27 Nov 2004 11:29:32 +0000 (11:29 +0000)
committerSven Luther <luther@debian.org>
Sat, 27 Nov 2004 11:29:32 +0000 (11:29 +0000)

Trivial merge