[python-pep8/f13/master] (5 commits) ...Merge branch 'master' into f13

[Ian Weller]

Summary of changes:

  1f48816... - Rebuilt for     https://fedoraproject.org/wiki/Features/P (*)
  d87435f... dist-git conversion (*)
  e7dd8f8... update to 0.6.0 (*)
  7a91422... RHBZ 633102: Requires: python-setuptools (*)
  5d74510... Merge branch 'master' into f13

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