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

[Than Ngo]

commit 4ff70754e3c7b7e07da009800ac260d5d40d18eb
Merge: 23ef5dd 72b4a0f
Author: Than Ngo <than at redhat.com>
Date:   Wed Oct 31 17:30:18 2012 +0100

    Merge branch 'master' into f17

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