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

Trivial merge