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

[Rex Dieter]

commit 2a663895f55b5edab90cd8fec95c419f4647d782
Merge: af4915e 74c04c6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Aug 2 08:36:04 2012 -0500

    Merge branch 'f17' into f16

 .gitignore                             |    4 +---
 kdelibs-4.8-solid_cd_eject.patch       |   13 -------------
 kdelibs-4.8.4-nepomuk-regression.patch |   15 ---------------
 kdelibs.spec                           |   18 +++++-------------
 sources                                |    2 +-
 5 files changed, 7 insertions(+), 45 deletions(-)
---