2ab1ebb Merge branch 'el6'

Merged and Committed by juergh 10 years ago
    Merge branch 'el6'
    
    Conflicts:
    	cloud-utils.spec
    
        
file modified
+29 -10