pullup from trunk To generate a diff of this commit: cvs diff -r5.136.2.6 -r5.136.2.7 krb5/src/lib/crypto/ChangeLog cvs diff -r5.4.2.1 -r5.4.2.2 krb5/src/lib/crypto/pbkdf2.c