85a9e6e Merge branch 'master' into el5

Merged and Committed by jeckersb 13 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	PyYAML.spec
    	sources
    
        
file modified
+1 -1
file modified
+33 -14
file modified
+1 -1