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

[Rex Dieter]

commit 379763bd17d79f71f162484e8e9919613207fe2d
Merge: efcabf6 2784671
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 08:37:34 2012 -0500

    Merge branch 'f17' into f16

 .gitignore                             |    4 +--
 kdelibs-4.8.1-nepomuk_threading.patch  |   52 --------------------------------
 kdelibs-4.8.1-sonnet-highlighter.patch |   24 --------------
 kdelibs.spec                           |   19 +++--------
 sources                                |    2 +-
 5 files changed, 7 insertions(+), 94 deletions(-)
---