Merge branch 'openssh-5.8p2'
authorLuke Howard <lukeh@padl.com>
Tue, 17 May 2011 10:23:45 +0000 (12:23 +0200)
committerLuke Howard <lukeh@padl.com>
Tue, 17 May 2011 10:23:45 +0000 (12:23 +0200)

Trivial merge