commit a874bed4d4071baae11149b0b177185347714187 Merge: de028e3 fa0fdac Author: Rex Dieter <rdieter at fedoraproject.org> Date: Sat Sep 29 16:59:47 2012 -0500 Merge branch 'f18' into f17 .gitignore | 1 + kdegraphics-thumbnailers.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---