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

[Rex Dieter]

commit a3e8073d45bebb81ae739c2e9fe4bea88f8bc2f2
Merge: 97eef5d 7595b47
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 4 11:01:29 2012 -0500

    Merge branch 'f18' into f17

 kdelibs.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---