[planet/el6] (13 commits) ...Merge branch 'epel7' into el6

[Jon Ciesla]

Summary of changes:

  ee9e813... Fix typo that causes a failure to update the common directo (*)
  55080b5... - Rebuilt for     https://fedoraproject.org/wiki/Features/P (*)
  8655a1e... dist-git conversion (*)
  fa80587... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  3b4279e... - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass (*)
  caf781c... - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass (*)
  5f60589... - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass (*)
  8a4352d... - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass (*)
  a3b7ea5... Spec cleanup. (*)
  07de364... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  c1406bb... Replace python-setuptools-devel BR with python-setuptools (*)
  76804bc... Drop timeoutsocket.py to fix BZ 498456. (*)
  7dd1a4a... Merge branch 'epel7' into el6

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