[python-dns/el6/master] (7 commits) ...Merge branch 'master' into el6

[Jeffrey C. Ollie]

Summary of changes:

  2206c4f... Fix typo that causes a failure to update the common directo (*)
  2a756ca... - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass (*)
  a9675a9... - Fix error (*)
  00b0672... - Rebuilt for     https://fedoraproject.org/wiki/Features/P (*)
  f2cd60f... dist-git conversion (*)
  5a0206f... - Add a patch from upstream to fix a Python 2.7 issue. (*)
  276719c... Merge branch 'master' into el6

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