merge from -debian branch
authorMark Hymers <mhy@debian.org>
Thu, 10 Jan 2008 15:12:13 +0000 (15:12 +0000)
committerMark Hymers <mhy@debian.org>
Thu, 10 Jan 2008 15:12:13 +0000 (15:12 +0000)

Trivial merge