[kde-runtime/f17: 22/22] Merge branch 'master' into f17

[Rex Dieter]

commit 09f273dc5d9462cd52b791b415e5db1428b9660f
Merge: 4751579 c671aa4
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 4 16:33:39 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	kde-runtime.spec
    	sources

 .gitignore                                         |    3 +-
 kde-runtime-4.7.90-nepomuk_onlyshowin_kde.patch    |    8 --
 kde-runtime-4.8.5-nepomuk_memleak.patch            |  111 --------------------
 kde-runtime-4.9.0-installdbgsymbols.patch          |   27 +++++
 ...-webkit.patch => kde-runtime-4.9.0-webkit.patch |   67 ++++++------
 kde-runtime.spec                                   |   84 +++++++++------
 sources                                            |    2 +-
 7 files changed, 115 insertions(+), 187 deletions(-)
---