Merge branch 'debian'
authorRuss Allbery <rra@debian.org>
Thu, 13 May 2010 17:21:23 +0000 (10:21 -0700)
committerRuss Allbery <rra@debian.org>
Thu, 13 May 2010 17:21:23 +0000 (10:21 -0700)

Trivial merge