fix mis-merge


Commit By: tlyu



Revision: 18683
Changed Files:
_U  branches/krb5-1-4/