3c3aef6
Merge branch 'master' into el5 Conflicts: python-zmq.spec - tests package requires main package - filter python3 and python26 libs