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