Merge branch 'debian'
authorRuss Allbery <rra@debian.org>
Thu, 19 Jun 2008 03:19:17 +0000 (20:19 -0700)
committerRuss Allbery <rra@debian.org>
Thu, 19 Jun 2008 03:19:17 +0000 (20:19 -0700)

Trivial merge