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

[Jaroslav Reznik]

commit efcabf6ef94321f4d6ed6de419c5bc43bb394e31
Merge: 1367bf1 0143b76
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Thu Mar 22 13:52:27 2012 +0100

    Merge branch 'master' into f16

 kdelibs-4.8.1-sonnet-highlighter.patch |   24 ++++++++++++++++++++++++
 kdelibs.spec                           |   12 +++++++++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---