pullup from trunk To generate a diff of this commit: cvs diff -r1.55.2.2 -r1.55.2.3 krb5/src/lib/kadm5/unit-test/ChangeLog cvs diff -r1.10 -r1.10.2.1 krb5/src/lib/kadm5/unit-test/api.1/lock.exp