0ee419b Merge branch 'master' into f19

Merged and Committed by jorton 10 years ago
    Merge branch 'master' into f19
    
    Conflicts:
    	httpd.spec
    
        
file modified
+16 -4