fix mis-merge Commit By: tlyu Revision: 18684 Changed Files: _U branches/krb5-1-4/ U branches/krb5-1-4/src/windows/identity/config/Makefile.w2k U branches/krb5-1-4/src/windows/identity/config/Makefile.w32