Merge commit 'upstream/2.1'
authorRuss Allbery <rra@debian.org>
Sun, 24 Aug 2008 00:07:52 +0000 (17:07 -0700)
committerRuss Allbery <rra@debian.org>
Sun, 24 Aug 2008 00:07:52 +0000 (17:07 -0700)

Trivial merge