[clamav/el6: 4/4] Merge branch 'el6' of ssh://pkgs.fedoraproject.org/clamav into el6

[Nick Bebout]

commit 9650322a3c84c2129ddcb0da4f23373ce6960169
Merge: a638626 2cfebfc
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sun Jan 1 16:44:31 2012 -0600

    Merge branch 'el6' of ssh://pkgs.fedoraproject.org/clamav into el6
    
    Conflicts:
    	freshclam.logrotate

---