[kwordquiz/f17: 10/10] Merge branch 'master' into f17

[Rex Dieter]

commit b43ca0526d435256a33b46b7331f17b99a7cde55
Merge: ce52a24 924efbc
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 10 07:49:24 2012 -0500

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

 .gitignore     |    3 +--
 kwordquiz.spec |   28 ++++++++++++++++++++++------
 sources        |    2 +-
 3 files changed, 24 insertions(+), 9 deletions(-)
---