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

Trivial merge