[kdelibs3/f17: 7/7] Merge branch 'master' of ssh://pkgs.fedoraproject.org/kdelibs3 into f17

[Kevin Kofler]

commit 1b5e24127d49e99a16004a31ca02d0bf81988822
Merge: c4e68e8 b8199a3
Author: Kevin Kofler <kevin.kofler at chello.at>
Date:   Tue Jun 12 01:55:41 2012 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/kdelibs3 into f17

 kdelibs-3.5.10-automake-version.patch |   17 +++++++++++++++++
 kdelibs3.spec                         |   14 +++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)
---