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

[Rex Dieter]

commit 400fd2ff50e43a5ce51985158f112b1d51740e7c
Merge: 7dbcc6a aa7184d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Nov 7 19:38:43 2010 -0600

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

 .gitignore                                         |    1 +
 ...emarks.patch => kdegames-4.5.3-trademarks.patch |  133 ++++++++++----------
 kdegames.spec                                      |    7 +-
 sources                                            |    2 +-
 4 files changed, 73 insertions(+), 70 deletions(-)
---