[khangman/f17: 11/11] Merge branch 'master' into f17

[Rex Dieter]

commit 6d8b2bc5cfc54f1aa447d1b4c5c8c9dc7888f1db
Merge: 5b83a8f a06378d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 10 07:37:53 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	khangman.spec
    	sources

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