[kdebase-runtime/f14/master: 3/3] Merge remote branch 'origin/master' into f14/master

[Rex Dieter]

commit 8ac3da34ebd81749b7cdeb123761c65c36d5ec61
Merge: 9f78f1d 57c10a4
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Oct 17 12:31:39 2010 -0500

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

 kdebase-runtime-4.5-speakersetup.patch | 1318 ++++++++++++++++++++++++++++++++
 kdebase-runtime.spec                   |   32 +-
 khelpcenter.desktop                    |  131 ----
 3 files changed, 1343 insertions(+), 138 deletions(-)
---
diff --cc kdebase-runtime.spec
index 31c9c04,f8130ca..2febeaa
--- a/kdebase-runtime.spec
+++ b/kdebase-runtime.spec
@@@ -111,8 -117,9 +117,10 @@@ BuildArch: noarc
  %patch3 -p1 -b .iconthemes-inherit
  #patch5 -p1 -b .manpath
  %patch6 -p1 -b .home_onlyshowin_kde
+ %patch100 -p1 -b .speakersetup
+ 
  
 +
  %build
  mkdir -p %{_target_platform}
  pushd %{_target_platform}