commit ef6d900f48eedebe4aa82df8f45b8ff12d25affb Merge: 9d5d369 6aa0bb6 Author: Rex Dieter <rdieter at fedoraproject.org> Date: Thu Jun 7 15:25:37 2012 -0500 Merge branch 'f17' into f16 .gitignore | 1 + kate.spec | 20 ++++++++++++++------ sources | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) ---