7d2a682 Merge branch 'master' into f19

Merged and Committed by bkabrda 10 years ago
    Merge branch 'master' into f19
    
    Conflicts:
    	python.spec
    
        
file modified
+29 -1