Merge from vendor branch OPENSSH:
authorPeter Avalos <pavalos@dragonflybsd.org>
Sat, 8 Sep 2007 04:52:53 +0000 (04:52 +0000)
committerPeter Avalos <pavalos@dragonflybsd.org>
Sat, 8 Sep 2007 04:52:53 +0000 (04:52 +0000)
Import OpenSSH 4.7p1.


Trivial merge