[kdegraphics-strigi-analyzer/f18: 7/7] Merge branch 'master' into f18

[Than Ngo]

commit c68093e09cff97418b1f0e56174deb8fe32abc4b
Merge: b2f0350 1a3f5ee
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 17:37:53 2013 +0100

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	kdegraphics-strigi-analyzer.spec
    	sources

 .gitignore                       |    1 +
 kdegraphics-strigi-analyzer.spec |   21 ++++++++++++++++++---
 sources                          |    2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index e0e9cec,eaa59b7..31c03e4
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
 +/kdegraphics-strigi-analyzer-4.8.5.tar.xz
 +/kdegraphics-strigi-analyzer-4.9.1.tar.xz
 +/kdegraphics-strigi-analyzer-4.9.2.tar.xz
 +/kdegraphics-strigi-analyzer-4.9.3.tar.xz
 +/kdegraphics-strigi-analyzer-4.9.4.tar.xz
 +/kdegraphics-strigi-analyzer-4.9.5.tar.xz
+ /kdegraphics-strigi-analyzer-4.10.1.tar.xz