CVS commit: src/crypto/dist/ssh

[Christos Zoulas <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Sun Feb 13 06:01:14 UTC 2005

Modified Files:
        src/crypto/dist/ssh: readpass.c

Log Message:
Merge conflicts.


To generate a diff of this commit:
cvs rdiff -r1.12 -r1.13 src/crypto/dist/ssh/readpass.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.