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

[Than Ngo]

commit 23ef5dd4469a70828c5c569f79134604c8729ad4
Merge: 899eac0 76aa7e7
Author: Than Ngo <than at redhat.com>
Date:   Wed Oct 31 17:18:55 2012 +0100

    Merge branch 'master' into f17

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