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

[Rex Dieter]

commit aae6e95b20ef1b62c1f5ece4ef26d0ca40808c0e
Merge: 4c1c1ae 49e0821
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 16:59:35 2012 -0500

    Merge branch 'f18' into f17

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