40aa3f0 Merge branch 'master' into f20

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