[golang/el6] (5 commits) ...Merge branch 'master' into el6

[Adam Miller]

Summary of changes:

  d0ddbae... re-order some patches, remove unneeded glibc deprecated mac (*)
  969848f... fix patchlevel for patch200 (*)
  a9aa183... update hostname patch (*)
  64f9c14... fix BSD/SVID patch, and fix up changelog entry (rpmlint was (*)
  3fb2038... Merge branch 'master' into el6

(*) This commit already existed in another branch; no separate mail sent