Merge from vendor branch OPENSSH:
authorPeter Avalos <pavalos@dragonflybsd.org>
Thu, 29 Mar 2007 00:46:51 +0000 (00:46 +0000)
committerPeter Avalos <pavalos@dragonflybsd.org>
Thu, 29 Mar 2007 00:46:51 +0000 (00:46 +0000)
Import OpenSSH 4.6p1.


Trivial merge