Merge branch 'master' of git.sv.nongnu.org:/srv/git/nmh
authorKen Hornstein <kenh@pobox.com>
Fri, 13 Jan 2012 17:05:13 +0000 (12:05 -0500)
committerKen Hornstein <kenh@pobox.com>
Fri, 13 Jan 2012 17:05:13 +0000 (12:05 -0500)

Trivial merge