pull up r17469, r17470 from trunk

Commit By: tlyu



Revision: 17473
Changed Files:
U   branches/krb5-1-4/src/lib/ChangeLog
U   branches/krb5-1-4/src/lib/gssapi32.def