c025bf7 Merge branch 'master' into f20 -- updates to fix incompatibility with

Merged and Committed by toshio 10 years ago
    Merge branch 'master' into f20 -- updates to fix incompatibility with
    f20 svn and merges our security patches in
    
    Conflicts:
    	.gitignore
    	python-setuptools.spec
    	sources
    
        
file modified
+3 -14
file modified
+26 -13
file modified
+3 -1