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

[Rex Dieter]

commit 2696a6b1d6a826e1dcc13816dbffc95595cf3c37
Merge: 28a74fd 6faf861
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 13:58:28 2012 -0500

    Merge branch 'master' into f16

 .gitignore                          |    1 +
 kdegames-4.7.97-fix-for-g++47.patch |   23 -----------------------
 kdegames.spec                       |    9 ++++-----
 sources                             |    2 +-
 4 files changed, 6 insertions(+), 29 deletions(-)
---