[kcolorchooser/f18: 7/7] Merge branch 'master' into f18

[Than Ngo]

commit 7d5cceea5a5a535cb1251ef20a61d67effa3e3d3
Merge: 41d11d4 2b43c27
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 17:04:05 2013 +0100

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

 .gitignore         |    1 +
 kcolorchooser.spec |   21 ++++++++++++++++++---
 sources            |    2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 9f60664,5bc8656..bae73d3
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
 +/kcolorchooser-4.8.5.tar.xz
 +/kcolorchooser-4.9.1.tar.xz
 +/kcolorchooser-4.9.2.tar.xz
 +/kcolorchooser-4.9.3.tar.xz
 +/kcolorchooser-4.9.4.tar.xz
 +/kcolorchooser-4.9.5.tar.xz
+ /kcolorchooser-4.10.1.tar.xz