commit 0515551f666d37089501b2124ea9d9380667ada8 Merge: 886b387 835c5e4 Author: Rex Dieter <rdieter at fedoraproject.org> Date: Thu Jun 7 20:18:37 2012 -0500 Merge branch 'f17' into f16 .gitignore | 1 + kdepim.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) ---