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

[Rex Dieter]

commit 99c727caf207e1b0f5427288bf2305a75df92405
Merge: 0ead3f6 d3d3470
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 17 09:43:22 2011 -0500

    Merge branch 'master' into f14

 strigi-0.7.6-libstreamanalyzer_pdf.patch |   27 +++++++++++++++++++++++++++
 strigi.spec                              |   13 ++++++++++++-
 2 files changed, 39 insertions(+), 1 deletions(-)
---