b529311 Merge remote branch 'origin/master' into f13/master

Merged and Committed by agoode 13 years ago
    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	googlecl.spec
    	sources
    
        
file modified
+1 -1
file modified
+4 -1
file modified
+1 -1