3ee9cf2 Merge branch 'master' into el6

Merged and Committed by agoode 13 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	python-gdata.spec
    	sources
    
        
file modified
+1 -1
file modified
+7 -1
file modified
+1 -1