3572131 Merge remote branch 'origin/el6/master'

Merged and Committed by rathann 13 years ago
    Merge remote branch 'origin/el6/master'
    
    Conflicts:
    	chemtool.spec
    
        
file modified
+0 -1