a877d5 Merge branch 'master' into f18

Merged and Committed by Than Ngo 11 years ago
    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	audiocd-kio.spec
    	sources
    
        
file modified
+1 -5
file modified
+18 -5
file modified
+1 -1