- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
Fix a bug in the sdist command
And another bug in sdist
Remove the python-setuptools-devel Virtual Provides as per this Fedora 21

  Change: http://fedoraproject.org/wiki/Changes/Remove_Python-setuptools-devel
Merge branch 'master' into nightly

Conflicts:
	python-setuptools.spec