[clamtk/f13/master: 3/3] Update to 4.29

[davem]

commit 17309a7d3a21aee54c9a4aca66dc5c6ac49f556f
Merge: 7dcf703 69f20b0
Author: Dave M <dave.nerd at gmail.com>
Date:   Sat Sep 11 07:29:17 2010 -0500

    Update to 4.29

 .gitignore  |    4 ++++
 clamtk.spec |    8 ++++++--
 sources     |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 71044bc,e45b5cb..291029a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,3 +1,9 @@@
  clamtk-4.27.tar.gz
 +<<<<<<< HEAD
 +=======
  clamtk-4.28.tar.gz
++<<<<<<< HEAD
++>>>>>>> master
++=======
+ /clamtk-4.29.tar.gz
 +>>>>>>> master