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

[Rex Dieter]

commit 5cd61dcdafffc16a2bcbfd79ba582e5a20ff70e5
Merge: 480a99d 5bb229c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 3 07:11:01 2012 -0500

    Merge branch 'f17' into f16

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