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

Trivial merge