f78b065 Merge branch 'master' into f17

Merged and Committed by nb 11 years ago
    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	clamav.spec
    	sources
    
        
file modified
+2 -2
file modified
+1 -1
file modified
+28 -26
file modified
+2 -2