[kcolorchooser/f16: 2/2] Merge branch 'master' into f16

[Rex Dieter]

commit ea73e5abd0f8144f079e954b6f87d2754f95ee81
Merge: d81f1e0 825779a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 13:57:06 2012 -0500

    Merge branch 'master' into f16

 .gitignore         |    1 +
 kcolorchooser.spec |    5 ++++-
 sources            |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---