645c50b Merge branch 'el5' into el6

Merged and Committed by fab 11 years ago
    Merge branch 'el5' into el6
    
    Conflicts:
    	.gitignore
    	cpuid.spec
    	sources
    
        
file modified
+22 -7
file modified
+1 -1