[kdegames/f13/master: 21/21] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit 7dbcc6a31aee150911a93107b69a81f7f615edcc
Merge: ccc61a9 be20613
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 22 08:47:55 2010 -0500

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	kdegames-4.4.4-trademarks.patch
    	kdegames.spec
    	sources

 .gitignore                       |    2 +-
 kdegames-4.4.4-trademarks.patch  |  643 -------------------------
 kdegames-4.4.95-trademarks.patch |  965 ++++++++++++++++++++++++++++++++++++++
 kdegames.spec                    |   75 +++-
 sources                          |    2 +-
 5 files changed, 1027 insertions(+), 660 deletions(-)
---