[kdegames/f14/master: 4/4] Merge branch 'master' into f14

[Rex Dieter]

commit 6aae2c71c6485934c66746ef12342821c673882b
Merge: 4c8f3f5 6b8b2be
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 29 14:16:10 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	kdegames.spec
    	sources

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