[clamav/f17: 14/14] Merge branch 'master' into f17

[Nick Bebout]

commit f78b065e61b9d9a95d0810237bb1a6bfeca3e404
Merge: 8bff1fe cd7c063
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Apr 2 20:17:01 2013 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	clamav.spec
    	sources

 .gitignore         |    4 +-
 clamav-update.cron |    2 +-
 clamav.spec        |   54 ++++++++++++++++++++++++++-------------------------
 sources            |    4 +-
 4 files changed, 33 insertions(+), 31 deletions(-)
---
diff --cc .gitignore
index bf57824,30db149..3734239
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,7 +1,3 @@@
--/clamav-0.97.6-norar.tar.xz
 -/main-54.cvd
 -/daily-15389.cvd
+ /clamav-0.97.7-norar.tar.xz
 -/main.cvd
 -/daily.cvd
 +/main-54.cvd
- /daily-15389.cvd
+ /daily-16898.cvd