[kig/f16: 10/10] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit c8da9717fa15207de5f4483b2c95a8db32c6e6bc
Merge: af775dc 994b739
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:41:23 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kig.spec
    	sources

 .gitignore |    3 +--
 kig.spec   |   29 +++++++++++++++++++++++++----
 sources    |    2 +-
 3 files changed, 27 insertions(+), 7 deletions(-)
---