[kdelibs/f14/master: 3/3] Merge remote branch 'origin/master' into f14/master

[Rex Dieter]

commit 8493938a76ddc1a7b5ca781548f62d0ab1f3fd59
Merge: d0913d6 1f8d878
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Oct 2 15:29:52 2010 -0500

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

 .gitignore                                         |    2 +-
 kdelibs.spec                                       |   19 +-
 ....5.1_fix_kdevelop-crash_katetextblock_cpp.patch |   19 --
 ....1_fix_kdevelop-crash_katetexthistory_cpp.patch |  289 --------------------
 ....5.1_fix_kdevelop-crash_katetexthistory_h.patch |   28 --
 sources                                            |    2 +-
 6 files changed, 11 insertions(+), 348 deletions(-)
---