[clamav/el5/master: 2/2] Merge branch 'el6' into el5

[Jan-Frode Myklebust]

commit 44c852187fbb517dd9084ca7100404b6fed6d05c
Merge: 728c0a6 825f174
Author: Jan-Frode Myklebust <janfrode at tanso.net>
Date:   Sun Mar 13 21:37:43 2011 +0100

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore

 .gitignore  |    6 +-----
 clamav.spec |   11 ++++++++++-
 sources     |    1 +
 3 files changed, 12 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index f6ee443,720667f..bf9c05a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,3 +1,2 @@@
- <<<<<<< HEAD
- clamav-0.95.1-norar.tar.bz2
- =======
--clamav-0.95.3-norar.tar.bz2
  /clamav-0.97-clean.tar.bz2
- >>>>>>> el6
+ /clamd-wrapper.tar.bz2