[kdeartwork/f18: 8/8] Merge branch 'master' into f18

[Than Ngo]

commit cb9a0ef4c7dbab8e1cb14e16e3933269ae0d6515
Merge: 6efa9dd 19f8c17
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 17:31:01 2013 +0100

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	kdeartwork.spec
    	sources

 .gitignore      |    1 +
 kdeartwork.spec |   57 +++++++++++++++++++++++++-----------------------------
 sources         |    2 +-
 3 files changed, 28 insertions(+), 32 deletions(-)
---
diff --cc .gitignore
index acfaf62,4b43621..6c88400
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,1 +1,3 @@@
 +/kdeartwork-4.8.5.tar.xz
 +/kdeartwork-4.9.5.tar.xz
+ /kdeartwork-4.10.1.tar.xz