Merge from upstream:

   - djm@cvs.openbsd.org 2012/04/11 13:34:17
     [ssh-keyscan.1 ssh-keyscan.c]
     now that sshd defaults to offering ECDSA keys, ssh-keyscan should also
     look for them by default; bz#1971

Approved by:	des
Vendor import of OpenSSH 6.0p1.
Remove autoprops :(
Vendor import of OpenSSH 6.1p1.
Vendor import of OpenSSH 6.2p1.
Upgrade to OpenSSH 6.2p1.  The most important new features are support
for a key revocation list and more fine-grained authentication control.