19f7c3e Merge branch 'master' into el5

Merged and Committed by toshio 13 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	python-fedora.spec
    	sources
    
        
file modified
+1 -1
file modified
+29 -6
file modified
+1 -1