[strigi/f14: 4/4] Merge branch 'master' into f14

[Rex Dieter]

commit 0ead3f6b3d76cf755c01da66f94feafa0512790b
Merge: fa8505d 736f89c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 14 08:13:32 2011 -0500

    Merge branch 'master' into f14

 .gitignore                |    2 +-
 sources                   |    2 +-
 strigi-0.7.5-no_rpm.patch |   72 ---------------------------------------------
 strigi.spec               |   36 ++++++++++++----------
 4 files changed, 22 insertions(+), 90 deletions(-)
---