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

[Rex Dieter]

commit 59fef517d27ec91b79ed6aac28c81b6b7d40ce10
Merge: 67f2420 d00f698
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 3 07:11:53 2012 -0500

    Merge branch 'f17' into f16

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