[kwordquiz/f16: 2/2] Merge branch 'master' into f16

[Rex Dieter]

commit 276d4ec915d1d7348201dc7f2ede222747395575
Merge: 02e7c06 019a26a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 14:06:49 2012 -0500

    Merge branch 'master' into f16

 .gitignore     |    1 +
 kwordquiz.spec |    5 ++++-
 sources        |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---