pullup to trunk

Commit By: lxs



Revision: 17368
Changed Files:
D   branches/krb5-1-4/src/mac/