[kdebase-runtime/f13/master: 35/35] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit 37a9832477a1faf149c9b63e0c6824470c8b09ef
Merge: 001fe27 57c10a4
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 21 20:18:26 2010 -0500

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	kdebase-runtime.spec
    	sources

 .gitignore                                    |    2 +-
 kdebase-runtime-4.4.0-virtuosoconverter.patch |   22 -
 kdebase-runtime-4.5-speakersetup.patch        | 1318 +++++++++++++++++++++++++
 kdebase-runtime.spec                          |  102 ++-
 khelpcenter.desktop                           |  131 ---
 sources                                       |    2 +-
 6 files changed, 1394 insertions(+), 183 deletions(-)
---