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

[Dennis Gilmore]

commit 728c0a6675486de0cac83ed18d426cc498e94670
Merge: b413e80 77e0359
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Wed Feb 23 21:22:32 2011 -0600

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

 clamav.spec |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)
---