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

[Rex Dieter]

commit 861ae774f5c41b372ca96473fca9a669402609aa
Merge: 11e62ae dcf8d91
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 3 07:19:41 2012 -0500

    Merge branch 'f17' into f16

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