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

[Rex Dieter]

commit cdedde6d1906c60e8ebf772c9eac356312a3a68f
Merge: 2509cb9 ee675a9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 21 12:23:12 2010 -0500

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	kdelibs.spec
    	sources

 .gitignore                                         |    4 +
 kde4.csh                                           |   14 -
 kde4.sh                                            |   11 -
 kdelibs-4.0.0-k3spell-hunspell.patch               |  305 --------------------
 kdelibs-4.3.98-no_rpath.patch                      |   25 --
 ...xecdir.patch => kdelibs-4.4.80-libexecdir.patch |   37 ++--
 kdelibs-4.4.80-no_rpath.patch                      |   26 ++
 ...ch => kdelibs-4.4.80-policykit-workaround.patch |   28 +-
 ...el.patch => kdelibs-4.4.85-parallel_devel.patch |  190 ++++++------
 kdelibs-4.5.1-knewstuff_gpg2.patch                 |   78 +++++
 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-plasma_wallpaper_configchanged.patch |   36 +++
 kdelibs.spec                                       |  295 +++++++++++++++-----
 sources                                            |    2 +-
 16 files changed, 541 insertions(+), 553 deletions(-)
---
diff --cc .gitignore
index 5160db4,500dbc2..1369fb7
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,1 +1,6 @@@
++<<<<<<< HEAD
 +kdelibs-4.4.3.tar.bz2
 +kdelibs-4.4.4.tar.bz2
++=======
+ /kdelibs-4.5.2.tar.bz2
++>>>>>>> origin/master