commit 76df1a02652932a019b5b028422b40c6da07fee3 Merge: 8e30ea3 dadd747 Author: Rex Dieter <rdieter at fedoraproject.org> Date: Thu Jun 14 07:03:28 2012 -0500 Merge branch 'f17' into f16 kdelibs-4.8.4-nepomuk-regression.patch | 15 +++++++++++++++ kdelibs.spec | 10 +++++++++- 2 files changed, 24 insertions(+), 1 deletions(-) ---