78b1053 Merge branch 'master' into f14

Merged and Committed by tomspur 13 years ago
    Merge branch 'master' into f14
    
    - update to new version
    - remove patch (is upstream)
    - run tests differently
    
    Conflicts:
    	.gitignore
    	python-zmq.spec
    	sources
    
    Signed-off-by: Thomas Spura <tomspur@fedoraproject.org>
    
        
file modified
+2 -0
file modified
+25 -14
file modified
+1 -1