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

[Rex Dieter]

commit 9f93be5f79429b713f02cb38241e730df534e983
Merge: c8da971 107b39f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 14:02:38 2012 -0500

    Merge branch 'master' into f16

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