[kdegraphics-strigi-analyzer/f16: 8/8] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 30cda385c2936c4867e949c8ec2328dc49bfc852
Merge: 536f4c1 2d34124
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:31:24 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kdegraphics-strigi-analyzer.spec
    	sources

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