[clamav/el4: 7/7] Merge branch 'el6' into el4

[Nick Bebout]

commit 99d8a3de60130a21630df161d7898bb0a0520691
Merge: 4144516 813ca6c
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Oct 18 20:14:41 2011 -0500

    Merge branch 'el6' into el4
    
    Conflicts:
    	clamav.spec

 .gitignore                |    2 ++
 Makefile                  |   14 ++++++++++++++
 clamav-0.97-clean.tar.bz2 |  Bin 40456202 -> 0 bytes
 clamav.spec               |   18 ++++++++++++++----
 sources                   |    2 +-
 5 files changed, 31 insertions(+), 5 deletions(-)
---