commit 39ecf8cd99584524f4720590bfbb8372fc0d3ee6 Merge: 78d1adf 51c9104 Author: Rex Dieter <rdieter at fedoraproject.org> Date: Fri Mar 30 14:00:47 2012 -0500 Merge branch 'master' into f16 .gitignore | 1 + kdetoys.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) ---