Merge branch 't/ssh_keys'

diff --cc NEWS
index 4430343ec73e641f401263aee9e3dbefb2aa5993,3295738632ef423ca4b36f68f3bcdc533d873e38..bf6f2bab2f93c1ecd414de569d3469a8c0f89676
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,8 -2,6 +2,9 @@@
  0.4.7 (to be announced) "infinite rollback"
  -------------------------------------------
  
 +      - Support for ESD, Pulseaudio, AIX, Solaris, IRIX and other
 +        platforms through the libao audio library.
++      - Support for RSA keys generated with ssh-keygen.
        - configure: improved options for ogg/vorbis/speex.
        - The git version reported by --version always matches HEAD.
        - The autogen script detects the number of processors and

diff --cc error.h
Simple merge

diff --cc web/manual.m4
Simple merge