Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/nmh
authorLyndon Nerenberg <lyndon@orthanc.ca>
Tue, 16 Oct 2012 19:39:59 +0000 (12:39 -0700)
committerLyndon Nerenberg <lyndon@orthanc.ca>
Tue, 16 Oct 2012 19:39:59 +0000 (12:39 -0700)

Trivial merge