[kde-wallpapers/f18: 10/10] Merge branch 'master' into f18

[Than Ngo]

commit 35fe2c3484ae7b10157bb8b00ac749699715e1fe
Merge: 59d8945 f2a215d
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 17:19:59 2013 +0100

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	kde-wallpapers.spec
    	sources

 .gitignore          |    1 +
 kde-wallpapers.spec |   29 ++++++++++++++++++++++-------
 sources             |    2 +-
 3 files changed, 24 insertions(+), 8 deletions(-)
---
diff --cc .gitignore
index 5dc85e2,a497c2c..72499aa
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
 +/kde-wallpapers-4.8.5.tar.xz
 +/kde-wallpapers-4.9.1.tar.xz
 +/kde-wallpapers-4.9.2.tar.xz
 +/kde-wallpapers-4.9.3.tar.xz
 +/kde-wallpapers-4.9.4.tar.xz
 +/kde-wallpapers-4.9.5.tar.xz
+ /kde-wallpapers-4.10.1.tar.xz