[kdelibs/f17: 32/32] Merge remote-tracking branch 'origin/master' into f17

[Rex Dieter]

commit 20c504f9d3c2e95fdc09aed600617eb54e482cc5
Merge: 288c7c3 81ae9a9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 4 12:11:39 2012 -0500

    Merge remote-tracking branch 'origin/master' into f17
    
    Conflicts:
    	.gitignore
    	0002-Trigger-installation-of-missing-components-when-inst.patch
    	kdelibs-udisks2-backend.patch
    	kdelibs.spec
    	sources

 .gitignore                                         |    1 +
 ...tallation-of-missing-components-when-inst.patch |   25 ++--
 kdelibs-4.8.3-kdeclarative-install-location.patch  |   13 --
 kdelibs-4.9.1-udisks_detatch_external_hdd.patch    |   19 +++
 kdelibs-udisks2-backend.patch                      |   20 ++-
 kdelibs.spec                                       |  156 ++++++++++----------
 sources                                            |    2 +-
 7 files changed, 125 insertions(+), 111 deletions(-)
---