commit 7e86db50b8184f45ba961b0650b39b56cf7a2874 Merge: 4b5a950 18eab55 Author: Rex Dieter <rdieter at fedoraproject.org> Date: Fri Aug 3 07:13:32 2012 -0500 Merge branch 'f17' into f16 .gitignore | 1 + kdetoys.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---