Merge branch 'debian'
authorRuss Allbery <rra@debian.org>
Sat, 15 May 2010 22:25:26 +0000 (15:25 -0700)
committerRuss Allbery <rra@debian.org>
Sat, 15 May 2010 22:25:26 +0000 (15:25 -0700)

Trivial merge