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

[Rex Dieter]

commit d8fbb8f15b76d494a92c6a5eab441fb361effd33
Merge: fa01666 df47543
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Nov 6 13:25:25 2010 -0500

    Merge remote branch 'origin/f14/master' into f13/master
    
    Conflicts:
    	.gitignore

 .gitignore                                 |    6 +-----
 kdelibs-4.5.2-comic_applet_kde253387.patch |   19 -------------------
 kdelibs-4.5.2-kio_krun_services.patch      |   14 --------------
 kdelibs-4.5.2-krun-kde#253294.patch        |   10 ----------
 kdelibs-4.5.2-kshareddatecache_time.patch  |   22 ----------------------
 kdelibs.spec                               |   18 ++++--------------
 sources                                    |    2 +-
 7 files changed, 6 insertions(+), 85 deletions(-)
---