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

[Rex Dieter]

commit f5fcc53b1236546736e8dca4cc1c5e84a237f540
Merge: b9b7158 d2796d8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:15:41 2012 -0500

    Merge branch 'f17' into f16

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