cccd39a Merge branch 'master' into el6

Merged and Committed by pbrady 12 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	python-eventlet.spec
    
        
file modified
+11 -1