a8c6061 Merge remote-tracking branch 'origin/master' into el4/master

Merged and Committed by rebus 13 years ago
    Merge remote-tracking branch 'origin/master' into el4/master
    
    Conflicts:
    	.gitignore
    	nikto-libwhisker2.patch
    	nikto.spec
    	sources
    
        
file modified
+3 -0
file modified
+20 -11
file modified
+56 -19
file modified
+1 -1