Merge branch 'upstream' into bug/unlink-pidfile
authorRuss Allbery <rra@debian.org>
Thu, 7 Apr 2011 00:57:04 +0000 (17:57 -0700)
committerRuss Allbery <rra@debian.org>
Thu, 7 Apr 2011 00:57:04 +0000 (17:57 -0700)

Trivial merge