Merge branch 'upstream' into 3.08.3
authorSven Luther <luther@debian.org>
Thu, 17 Mar 2005 15:33:13 +0000 (15:33 +0000)
committerSven Luther <luther@debian.org>
Thu, 17 Mar 2005 15:33:13 +0000 (15:33 +0000)

Trivial merge