f9235ee Merge branch 'el6'

Merged and Committed by aalvarez 10 years ago
    Merge branch 'el6'
    
    Conflicts:
    	lcgdm.spec
    
        
file modified
+40 -6
file modified
+1 -2