4b3c6a0 Merge branch 'master' into el6

Merged and Committed by dchen 9 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	libsvm.spec
    
        
file modified
+4 -0
file modified
+30 -26