Merge branch 'debian'
authorRuss Allbery <rra@debian.org>
Mon, 10 Nov 2008 22:55:28 +0000 (14:55 -0800)
committerRuss Allbery <rra@debian.org>
Mon, 10 Nov 2008 22:55:28 +0000 (14:55 -0800)

Trivial merge