commit 7f431cc1d509e6e8a800175e797b4068464ac5d5 Merge: 0af1e55 384bc83 Author: Rex Dieter <rdieter at fedoraproject.org> Date: Sun Mar 18 17:05:20 2012 -0500 Merge branch 'f17' into f16 kdepimlibs.spec | 81 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 68 insertions(+), 13 deletions(-) ---