[Spawning/el6/master] (6 commits) ...Merge branch 'master' into el6

[smilner]

Summary of changes:

  eb65dbb... fix for BZ#613615 (*)
  17517fd... dist-git conversion (*)
  7c386df... - Rebuild for https://fedoraproject.org/wiki/Features/Pytho (*)
  44af1e3... Updated for upstream release (*)
  46ee538... fixed without-with patch (*)
  1ee730b... Merge branch 'master' into el6

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