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

[Rex Dieter]

commit 849f86f6fc60a226ab886962dbee5ac8eaa8710e
Merge: e96737c 720554e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 13:59:20 2012 -0500

    Merge branch 'master' into f16

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