The attached patch fixes ssh-copy-id.

-Jesse