Merge branch 'debian'
authorRuss Allbery <rra@debian.org>
Sun, 24 Aug 2008 00:59:43 +0000 (17:59 -0700)
committerRuss Allbery <rra@debian.org>
Sun, 24 Aug 2008 00:59:43 +0000 (17:59 -0700)

Trivial merge