Merge branch 'upstream'
authorRalf Treinen <treinen@debian.org>
Tue, 30 Sep 2003 19:41:24 +0000 (19:41 +0000)
committerRalf Treinen <treinen@debian.org>
Tue, 30 Sep 2003 19:41:24 +0000 (19:41 +0000)

Trivial merge