[kde-base-artwork/f18: 7/7] Merge branch 'master' into f18

[Than Ngo]

commit 35324d2055afc8f38ad1477cbfda0889e65e8eb4
Merge: 59619aa f681eb6
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 17:08:32 2013 +0100

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

 .gitignore            |    1 +
 kde-base-artwork.spec |   21 ++++++++++++++++++---
 sources               |    2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index db1278c,55ab1e3..3738697
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,1 +1,6 @@@
 +/kde-base-artwork-4.9.1.tar.xz
 +/kde-base-artwork-4.9.2.tar.xz
 +/kde-base-artwork-4.9.3.tar.xz
 +/kde-base-artwork-4.9.4.tar.xz
 +/kde-base-artwork-4.9.5.tar.xz
+ /kde-base-artwork-4.10.1.tar.xz