8847040 Merge branch 'master' into f16

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