Merge branch 'debian'
authorRuss Allbery <rra@debian.org>
Tue, 11 Aug 2009 00:18:38 +0000 (17:18 -0700)
committerRuss Allbery <rra@debian.org>
Tue, 11 Aug 2009 00:18:38 +0000 (17:18 -0700)

Trivial merge