[kdebase-runtime/f14/master: 7/7] Merge branch 'master' into f14

[Rex Dieter]

commit ab9b1ed950543c5fa331346b8e7300b3326aac09
Merge: 569526a 15050f1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 29 12:31:29 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	kdebase-runtime.spec
    	sources

 .gitignore           |    2 +-
 kdebase-runtime.spec |   15 ++++++++-------
 sources              |    2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)
---
diff --cc kdebase-runtime.spec
index 70fdef6,be5f82c..b804cd9
--- a/kdebase-runtime.spec
+++ b/kdebase-runtime.spec
@@@ -121,7 -116,6 +116,10 @@@ BuildArch: noarc
  %patch3 -p1 -b .iconthemes-inherit
  #patch5 -p1 -b .manpath
  %patch6 -p1 -b .home_onlyshowin_kde
++<<<<<<< HEAD
 +%patch100 -p1 -b .kioslave
++=======
++>>>>>>> master
  
  %build
  mkdir -p %{_target_platform}