[kdegames/f16: 14/14] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 28a74fdf937c8cbdf3f352577164501c933ac0b1
Merge: 1ad65d4 4f857b1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:23:21 2012 -0600

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

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