[python-feedcache/el6] (6 commits) ...Merge branch 'master' into el6

[Luke Macken]

Summary of changes:

  c13ad05... Fix typo that causes a failure to update the common directo (*)
  a784a0d... - Rebuilt for     https://fedoraproject.org/wiki/Features/P (*)
  c19eac8... dist-git conversion (*)
  9a666d2... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  d9de7ce... Update to 1.3.1 (#700050) (*)
  376e1dc... Merge branch 'master' into el6

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