Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/nmh
authorLyndon Nerenberg <lyndon@orthanc.ca>
Fri, 27 Jan 2012 16:16:57 +0000 (08:16 -0800)
committerLyndon Nerenberg <lyndon@orthanc.ca>
Fri, 27 Jan 2012 16:16:57 +0000 (08:16 -0800)

Trivial merge