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

[davem]

commit 0635e090a16d4f6b776f6a4c1b9b1aa45323bef4
Merge: 17309a7 f4279f6
Author: Dave M <dave.nerd at gmail.com>
Date:   Sun Nov 7 08:06:22 2010 -0600

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore                        |    4 ++++
 .gitignore.BACKUP.11742.gitignore |   13 +++++++++++++
 .gitignore.BASE.11742.gitignore   |    3 +++
 .gitignore.LOCAL.11742.gitignore  |    9 +++++++++
 .gitignore.REMOTE.11742.gitignore |    4 ++++
 clamtk.spec                       |    5 ++++-
 sources                           |    2 +-
 7 files changed, 38 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 291029a,7d66352..732da2b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,9 -1,4 +1,13 @@@
  clamtk-4.27.tar.gz
 +<<<<<<< HEAD
 +=======
  clamtk-4.28.tar.gz
 +<<<<<<< HEAD
 +>>>>>>> master
 +=======
  /clamtk-4.29.tar.gz
++<<<<<<< HEAD
++>>>>>>> master
++=======
+ /clamtk-4.30.tar.gz
 +>>>>>>> master
diff --cc .gitignore.BACKUP.11742.gitignore
index 0000000,0000000..732da2b
new file mode 100644
--- /dev/null
+++ b/.gitignore.BACKUP.11742.gitignore
@@@ -1,0 -1,0 +1,13 @@@
++clamtk-4.27.tar.gz
++<<<<<<< HEAD
++=======
++clamtk-4.28.tar.gz
++<<<<<<< HEAD
++>>>>>>> master
++=======
++/clamtk-4.29.tar.gz
++<<<<<<< HEAD
++>>>>>>> master
++=======
++/clamtk-4.30.tar.gz
++>>>>>>> master
diff --cc .gitignore.BASE.11742.gitignore
index 0000000,0000000..e45b5cb
new file mode 100644
--- /dev/null
+++ b/.gitignore.BASE.11742.gitignore
@@@ -1,0 -1,0 +1,3 @@@
++clamtk-4.27.tar.gz
++clamtk-4.28.tar.gz
++/clamtk-4.29.tar.gz
diff --cc .gitignore.LOCAL.11742.gitignore
index 0000000,0000000..291029a
new file mode 100644
--- /dev/null
+++ b/.gitignore.LOCAL.11742.gitignore
@@@ -1,0 -1,0 +1,9 @@@
++clamtk-4.27.tar.gz
++<<<<<<< HEAD
++=======
++clamtk-4.28.tar.gz
++<<<<<<< HEAD
++>>>>>>> master
++=======
++/clamtk-4.29.tar.gz
++>>>>>>> master
diff --cc .gitignore.REMOTE.11742.gitignore
index 0000000,0000000..7d66352
new file mode 100644
--- /dev/null
+++ b/.gitignore.REMOTE.11742.gitignore
@@@ -1,0 -1,0 +1,4 @@@
++clamtk-4.27.tar.gz
++clamtk-4.28.tar.gz
++/clamtk-4.29.tar.gz
++/clamtk-4.30.tar.gz