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

[Rex Dieter]

commit 67f2420b8a528ae3e5a8825b240f2ed0378f1f2d
Merge: 528efdb 107193d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:17:55 2012 -0500

    Merge branch 'f17' into f16

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