e71f41e Merge branch 'master' into el6

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