[kdelibs/f16: 2/2] Merge remote-tracking branch 'origin/f17' into f16

[Lukas Tinkl]

commit b59828603b116d150cb0ab3c55bc4de80b5c8326
Merge: 9c68dd7 ed3f432
Author: Lukas Tinkl <lukas at kde.org>
Date:   Fri Jun 29 15:39:21 2012 +0200

    Merge remote-tracking branch 'origin/f17' into f16

 kdelibs-udisks2-backend.patch |   91 ++++++++++++++++++++++++++++-------------
 kdelibs.spec                  |    5 ++-
 2 files changed, 67 insertions(+), 29 deletions(-)
---