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

[Rex Dieter]

commit fa8505ded9b63f904cd914be4ac29364c64e42ec
Merge: ce04de7 b0591f9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 7 14:54:47 2011 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	strigi.spec

 .gitignore                                 |    3 +-
 sources                                    |    2 +-
 strigi-0.6.2-multilib.patch                |  108 ----------------------------
 strigi-0.7.2-kdebug234398.patch            |   12 ---
 strigi-0.7.2-no_rpm.patch                  |   80 --------------------
 strigi-0.7.5-no_rpm.patch                  |   72 ++++++++++++++++++
 strigi-0.7.5-static_convenience_libs.patch |   17 +++++
 strigi.spec                                |   95 ++++++++++++++++++-------
 8 files changed, 162 insertions(+), 227 deletions(-)
---