pullup from trunk To generate a diff of this commit: cvs diff -r5.90 -r5.90.6.1 krb5/src/appl/telnet/telnet/ChangeLog cvs diff -r5.18 -r5.18.10.1 krb5/src/appl/telnet/telnet/telnet.c