[clamtk/f12/master: 11/11] update to 4.28

[davem]

commit 87915d3782f7fbd2dca4e7f97fcd6ada1dceb59a
Merge: ff83014 1d83183
Author: Dave M <dave.nerd at gmail.com>
Date:   Tue Aug 17 09:41:52 2010 -0500

    update to 4.28

 .gitignore  |    4 ++++
 clamtk.spec |   12 ++++++++++--
 sources     |    2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index e544a98,e31855d..71044bc
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,5 @@@
  clamtk-4.27.tar.gz
++<<<<<<< HEAD
++=======
+ clamtk-4.28.tar.gz
++>>>>>>> master