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

[Rex Dieter]

commit 480a99d847da48e1d8509257a2e99a10f1237c49
Merge: 87dcd56 ba67a19
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:17:42 2012 -0500

    Merge branch 'f17' into f16

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