05b65b4 Merge branch 'master' into f12

Merged and Committed by Peter Halliday 13 years ago
    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	python-pip.spec
    	sources
    
        
file modified
+1 -0
file modified
+11 -6
file modified
+1 -1