c7458a3 Merge branch 'master' into f14

Merged and Committed by tomspur 13 years ago
    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	zeromq.spec
    
        
file modified
+1 -0
file modified
+19 -21