Merge branch 'upstream' into 3.09.0
authorSven Luther <luther@debian.org>
Thu, 27 Oct 2005 19:08:40 +0000 (19:08 +0000)
committerSven Luther <luther@debian.org>
Thu, 27 Oct 2005 19:08:40 +0000 (19:08 +0000)

Trivial merge