merge conflicts, adjust the build.

Update build framework for latest heimdal-1-5-branch

Ok'ed and reviewed by elric@

Autogenerated headers for heimdal head-20110412.