Merge commit 'upstream/2.2.1' into debian
authorRuss Allbery <rra@debian.org>
Tue, 8 Sep 2009 01:10:41 +0000 (18:10 -0700)
committerRuss Allbery <rra@debian.org>
Tue, 8 Sep 2009 01:10:41 +0000 (18:10 -0700)

Trivial merge