[kcolorchooser/f17: 9/9] Merge branch 'master' into f17

[Rex Dieter]

commit 9d618d0f722d333f7f0881923f1004f8834fc22c
Merge: 22e58e8 53b00e6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 8 08:01:35 2012 -0500

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

 .gitignore         |    3 +--
 kcolorchooser.spec |   25 ++++++++++++++++++++-----
 sources            |    2 +-
 3 files changed, 22 insertions(+), 8 deletions(-)
---