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

[Rex Dieter]

commit 0e345426615ce1118cb6177f500607344f1e8e7a
Merge: 37fb36d 1d70ef7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jan 9 10:31:18 2012 -0600

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

 .gitignore                                 |    1 +
 sources                                    |    2 +-
 strigi-0.7.5-static_convenience_libs.patch |   17 -------
 strigi-0.7.6-libstreamanalyzer_pdf.patch   |   27 ------------
 strigi-0.7.7-xpmfix.patch                  |   64 ++++++++++++++++++++++++++++
 strigi.spec                                |   19 ++++----
 6 files changed, 76 insertions(+), 54 deletions(-)
---