pullup from trunk To generate a diff of this commit: cvs diff -r5.136.2.3 -r5.136.2.4 krb5/src/lib/crypto/ChangeLog cvs diff -r5.3 -r5.3.2.1 krb5/src/lib/crypto/combine_keys.c