[kdegames/f14/master: 3/3] Merge remote-tracking branch 'origin/master' into f14/master

[Rex Dieter]

commit 7a972bece9236e153c9e392a4fe5550fed2a7c82
Merge: 287aef3 0fff27d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri May 6 13:56:49 2011 -0500

    Merge remote-tracking branch 'origin/master' into f14/master

 .gitignore    |    2 +-
 kdegames.spec |  314 +++++++++++++++++++++++++++++++++++++++++++--------------
 sources       |    2 +-
 3 files changed, 242 insertions(+), 76 deletions(-)
---