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

[Than Ngo]

commit 43523c02ed7d780f374949e76ce693ee16c25771
Merge: 7828b6a b02ceb2
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 17:34:30 2013 +0100

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

 .gitignore                  |    1 +
 kdegraphics-mobipocket.spec |   21 ++++++++++++++++++---
 sources                     |    2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 2f9c85a,4455758..3c999f3
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
 +/kdegraphics-mobipocket-4.8.5.tar.xz
 +/kdegraphics-mobipocket-4.9.1.tar.xz
 +/kdegraphics-mobipocket-4.9.2.tar.xz
 +/kdegraphics-mobipocket-4.9.3.tar.xz
 +/kdegraphics-mobipocket-4.9.4.tar.xz
 +/kdegraphics-mobipocket-4.9.5.tar.xz
+ /kdegraphics-mobipocket-4.10.1.tar.xz