commit 9b506dba80f62786ccb035bbf4a91c20457e3527 Merge: ed74afb 3e2bef3 Author: Rex Dieter <rdieter at fedoraproject.org> Date: Tue Nov 6 20:37:10 2012 -0600 Merge branch 'f18' into f17 .gitignore | 1 + kde-printer-applet.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---