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

[Than Ngo]

commit 7ef0ba59d7f50e1c89d7e5bf79520071ae5a71aa
Merge: 2883f68 2de62e9
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:31:21 2012 +0100

    Merge branch 'f18' into f17

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