1129ba2 Merge branch 'master' into f19

Merged and Committed by jluza 10 years ago
    Merge branch 'master' into f19
    
    Conflicts:
    	.gitignore
    	libcomps.spec
    	sources
    
        
file modified
+4 -0
file modified
+9 -0
file modified
+4 -0