12266f4 Merge branch 'f18' into el6

Merged and Committed by pbrady 11 years ago
    Merge branch 'f18' into el6
    
    Conflicts:
    	python-glanceclient.spec
    
        
file modified
+6 -2