[kdesdk/f13/master: 7/7] Merge remote branch 'origin/f14/master' into f13/master

[Rex Dieter]

commit 47564af11dff99503fd131280e3b32660f9be982
Merge: 5c3e992 630e0ac
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Dec 4 15:23:06 2010 -0600

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

 .gitignore                            |    1 +
 kdesdk-4.5.3-kompare-kde#249976.patch |   15 ---------------
 kdesdk.spec                           |   16 ++++++----------
 sources                               |    2 +-
 4 files changed, 8 insertions(+), 26 deletions(-)
---