commit 6af426abaef21030d8d6fa3ccf52a0b6b15963ce Merge: 2a8410d adb5886 Author: Jan-Frode Myklebust <janfrode at tanso.net> Date: Tue Mar 15 18:35:24 2011 +0100 Merge branch 'el6' into el4 clamav-milter.init | 2 +- clamav.init | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---