[kdegraphics-thumbnailers/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit 923a25cc9fbabeae752fbf74e45d7e651e1f3c99
Merge: 7ef0ba5 41b5377
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 07:44:57 2012 -0600

    Merge branch 'f18' into f17

 .gitignore                    |    1 +
 kdegraphics-thumbnailers.spec |    5 ++++-
 sources                       |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---