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

[Rex Dieter]

commit 351f005e800295eff3e741c4022b407116b6ef5b
Merge: 276d4ec 2ac07be
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 23:04:54 2012 -0500

    Merge branch 'master' into f16

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