commit 4b5a9500ef75943cfd17e154a9eaf9e8690d48ab Merge: 2420e75 c39f3aa Author: Rex Dieter <rdieter at fedoraproject.org> Date: Thu Jun 7 20:19:27 2012 -0500 Merge branch 'f17' into f16 .gitignore | 1 + kdetoys.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---