Merge commit 'upstream/1.4.1'
authorRuss Allbery <rra@debian.org>
Mon, 14 Mar 2011 00:48:03 +0000 (17:48 -0700)
committerRuss Allbery <rra@debian.org>
Mon, 14 Mar 2011 00:48:03 +0000 (17:48 -0700)

Trivial merge