Merge branch 'debian'
authorRuss Allbery <rra@debian.org>
Sat, 8 Aug 2009 01:09:39 +0000 (18:09 -0700)
committerRuss Allbery <rra@debian.org>
Sat, 8 Aug 2009 01:09:39 +0000 (18:09 -0700)

Trivial merge