[clamav/f13/master: 13/13] Merge remote branch 'origin/master' into f13

[Nick Bebout]

commit 1fff398bf693f0f435708d2698024aa1700724d1
Merge: 6faa0c9 5b7eb36
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Aug 10 20:49:54 2010 -0400

    Merge remote branch 'origin/master' into f13
    
    Conflicts:
    	clamav.spec

 clamav.spec |   44 +++++++++++++++++++++++++++++++++++---------
 verinfo     |    2 +-
 2 files changed, 36 insertions(+), 10 deletions(-)
---