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

[Rex Dieter]

commit 287aef39d6d12e36d46d738656b223c6c147f468
Merge: 5288676 29d6cca
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Apr 9 10:12:31 2011 -0500

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

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