commit bf0e75ceca3c35d1d972dfbec54e49d58a302dbc Merge: 3f874a3 3853d15 Author: Rex Dieter <rdieter at fedoraproject.org> Date: Tue Nov 6 20:34:10 2012 -0600 Merge branch 'f18' into f17 .gitignore | 1 + kdegraphics-mobipocket.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---