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

[Vincent Batts]

Summary of changes:

573d0ba... not sure why go1.2.2 shuffled some of the arch-depenedent f (*)
  28979ba... more rearranging (*)
  e46d680... nach ein mahl (*)
  789ff2e... nach ein mahl (*)
  81323f3... Merge branch 'master' into el6

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