pullup from trunk To generate a diff of this commit: cvs diff -r5.136.2.4 -r5.136.2.5 krb5/src/lib/crypto/ChangeLog cvs diff -r5.6.2.1 -r5.6.2.2 krb5/src/lib/crypto/string_to_key.c