Vendor import of OpenSSH-portable 3.6.1p1.

This commit was generated by cvs2svn to compensate for changes in r113908,
which included commits to RCS files with non-trunk default branches.