d3fb538 Merge branch 'master' into f15

Merged and Committed by Christopher Aillon 12 years ago
    Merge branch 'master' into f15
    
    Conflicts:
    	.gitignore
    	gnome-user-docs.spec
    	sources
    
        
file modified
+2 -9
file modified
+4 -1
file modified
+1 -1