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

[Rex Dieter]

commit 11e62ae0205635190e388409a7be29941bb686f6
Merge: 745c51c 26911f2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:21:04 2012 -0500

    Merge branch 'f17' into f16

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