5b81420 Merge remote branch 'origin/master' into el6/master

Merged and Committed by pghmcfc 13 years ago
    Merge remote branch 'origin/master' into el6/master
    
    Conflicts:
    	.gitignore
    	mod_fcgid.spec
    	sources
    
        
file modified
+1 -1
file modified
+25 -12
file modified
+1 -1