commit 585713afdffebebf6da33ba83bfaa403ac53409a Merge: d6c2f5e ae95992 Author: Jan-Frode Myklebust <janfrode at tanso.net> Date: Wed Jul 27 10:08:35 2011 +0200 Merge branch 'el6' into el4 .gitignore | 2 +- clamav.spec | 25 +++++++++++++++++++------ sources | 4 ++-- 3 files changed, 22 insertions(+), 9 deletions(-) ---