[clamtk/f13/master: 9/9] Merge branch 'master' into f13

[davem]

commit 7dcf70325db2308ea714a29295bd3f06f0c28913
Merge: 7b880d0 1d83183
Author: Dave M <dave.nerd at gmail.com>
Date:   Tue Aug 17 09:32:29 2010 -0500

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	clamtk.spec
    	sources

 .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