[kdelibs/f17: 4/4] Merge branch 'f18' into f17

[Rex Dieter]

commit 7d2ab2359e407232f43f0f3f51db87aaff7f66a6
Merge: 4870c19 9866b45
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Dec 28 13:04:34 2012 -0600

    Merge branch 'f18' into f17
    
    Conflicts:
    	kdelibs.spec

 .gitignore                                         |    3 +-
 ...hen-no-service-was-selected-user-clicked-.patch |   25 --
 ...-check-parent-mimetypes-in-protocolForArc.patch |   53 ---
 kdelibs-solid_qt_no_debug_output.patch             |   27 ++
 kdelibs-udisks2-kfileplacesdevicecache.patch       |  406 --------------------
 kdelibs.spec                                       |   27 +-
 sources                                            |    2 +-
 7 files changed, 41 insertions(+), 502 deletions(-)
---