[kcolorchooser/f16: 10/10] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit d81f1e0a9870bb0cde7135fbd21fa3e7b7a47bcf
Merge: 630a10f bf610ff
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:27:25 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kcolorchooser.spec
    	sources

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