[khangman/f16: 8/8] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit db501eb5d391137e2aa083a7f61913f918a0d0c3
Merge: a1c64a3 34e29b0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:40:46 2012 -0600

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

 .gitignore    |    3 +--
 khangman.spec |   30 +++++++++++++++++++++++++-----
 sources       |    2 +-
 3 files changed, 27 insertions(+), 8 deletions(-)
---