Merge branch 'debian'
authorRuss Allbery <rra@debian.org>
Sun, 3 Jan 2010 08:29:32 +0000 (00:29 -0800)
committerRuss Allbery <rra@debian.org>
Sun, 3 Jan 2010 08:29:32 +0000 (00:29 -0800)

Trivial merge