8e33d25 Merge branch 'master' into f19

Merged and Committed by miminar 10 years ago
    Merge branch 'master' into f19
    
    Conflicts:
    	.gitignore
    	hwdata.spec
    	sources
    
        
file modified
+1 -1
file modified
+4 -1
file modified
+1 -1