99d8a3d Merge branch 'el6' into el4

Merged and Committed by nb 12 years ago
    Merge branch 'el6' into el4
    
    Conflicts:
    	clamav.spec
    
        
file modified
+2 -0
file added
+14
file modified
+14 -4
file modified
+1 -1