9efc8bf Merge remote branch 'origin/el6' into el5

Merged and Committed by robert 11 years ago
    Merge remote branch 'origin/el6' into el5
    
    Conflicts:
    	.gitignore
    	clamav.spec
    	sources
    
        
file modified
+6 -4
file modified
+31 -59
file added
+8
file added
+17
file added
+5
file modified
+2 -2