3c3aef6 Merge branch 'master' into el5

Merged and Committed by Thomas Spura 12 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	python-zmq.spec
    
    - tests package requires main package
    - filter python3 and python26 libs
    
        
file modified
+20 -2
file added
+32