[kdelibs/f18: 5/5] Merge branch 'master' into f18

[Rex Dieter]

commit 01e36094ea68953bcb173c4ea8ceeac0183b9e7b
Merge: c690951 b012e59
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 25 13:22:10 2012 -0500

    Merge branch 'master' into f18

 ...s-4.9.2-cache-solid-device-in-kfileplaces.patch |  117 ++++++++++++++++++++
 kdelibs.spec                                       |   15 +++-
 2 files changed, 131 insertions(+), 1 deletions(-)
---