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

[Rex Dieter]

commit 56f3a8861fe4cb5b235ebadeaf8691eff421daf9
Merge: 30cda38 2207e6b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 13:59:07 2012 -0500

    Merge branch 'master' into f16

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