[cpuid/el6] (4 commits) ...Merge branch 'master' into el6

[Fabian Affolter]

Summary of changes:

  618b4d4... - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass (*)
  b5bfa61... - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass (*)
  51dddbd... * Sat Jun 15 2013 Fabian Affolter <mail at fabian-affolter.ch> (*)
  7b62918... Merge branch 'master' into el6

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