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

[Rex Dieter]

commit 02e7c067b4c6d6d5c4e3712c35eada2e5d01ef9a
Merge: a77a747 94f0a8e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:53:17 2012 -0600

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

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