Merge commit 'upstream/2.3'
authorRuss Allbery <rra@debian.org>
Fri, 6 Nov 2009 22:57:07 +0000 (14:57 -0800)
committerRuss Allbery <rra@debian.org>
Fri, 6 Nov 2009 22:57:07 +0000 (14:57 -0800)

Trivial merge