commit ed40f3457c92451986c122635fd0e8ac70bd92bb Merge: f917605 48d13aa Author: Rex Dieter <rdieter at fedoraproject.org> Date: Tue Nov 6 20:40:30 2012 -0600 Merge branch 'f18' into f17 .gitignore | 1 + kmousetool.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---