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

[Rex Dieter]

commit 9c68dd72d1c2f71577679aaed5386bbae96560bc
Merge: 76df1a0 a09ae4e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jun 20 13:11:53 2012 -0500

    Merge branch 'f17' into f16

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