afefd20
Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-setuptools Conflicts: python-setuptools.spec