8fcaef2 Merge branch 'master' into f14/master

Merged and Committed by Fedora 13 years ago
    Merge branch 'master' into f14/master
    
    Conflicts:
    	.gitignore
    	ailurus.spec
    	sources
    
        
file modified
+4 -0
file modified
+14 -0
file modified
+4 -0