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

[Rex Dieter]

commit 1e3614f3b6c09f09ab862e6f2a10661ac76764d5
Merge: 6aae2c7 be20613
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Oct 2 21:46:32 2010 -0500

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

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