15781ee Merge branch 'master' into el5

Merged and Committed by fab 11 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	cpuid.spec
    	sources
    
        
file modified
+8 -0
file modified
+33 -7
file modified
+4 -0