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

[Rex Dieter]

commit d0913d6ff74686eb631f3311ad55d979b3dc0b89
Merge: 8baa4ab cd78701
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 11 11:40:06 2010 -0500

    Merge branch 'master' into f14

 kdelibs.spec                                       |   12 +-
 ....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 ++
 4 files changed, 347 insertions(+), 1 deletions(-)
---