79c8221 Merge branch 'f19' into f20

Merged and Committed by mrunge 10 years ago
    Merge branch 'f19' into f20
    
    Conflicts:
    	python-celery.spec
    
        
file modified
+29 -5