resolve conflicts, document HEAD vs release import process.

merge conflicts, adjust the build.

Autogenerated headers for heimdal head-20110412.