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

[Rex Dieter]

commit fdb5caf803e721ece3322ccbe99f6954f873a000
Merge: de86164 1dba7bb
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Nov 7 19:41:35 2010 -0600

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

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