[pinot/f14: 6/6] Merge remote-tracking branch 'origin/master' into f14

[drago01]

commit 1a006103b7004a705a1ba4eec0884e00f3495b18
Merge: b85708b f1eb890
Author: Adel Gadllah <adel.gadllah at gmail.com>
Date:   Sun May 22 11:28:46 2011 +0200

    Merge remote-tracking branch 'origin/master' into f14
    
    Conflicts:
    	pinot.spec

 .gitignore               |    1 +
 fix_lang_detect.patch    |  168 ----------------------------------------------
 pinot-0.94-gmime26.patch |   12 ---
 pinot.spec               |   28 ++++----
 sources                  |    2 +-
 5 files changed, 16 insertions(+), 195 deletions(-)
---
diff --cc pinot.spec
index 5823ace,8ce8c2e..5c4f9a6
--- a/pinot.spec
+++ b/pinot.spec
@@@ -130,6 -127,16 +127,9 @@@ f
  
  
  %changelog
+ * Wed May 20 2011 Martin Dengler <martin at martindengler.com> - 0.97-1
+ - New upstream version
+ 
 -* Fri May 06 2011 Karsten Hopp <karsten at redhat.com> 0.96-3.1
 -- disable gmime-2.6 patch, not required anymore
 -- buildrequire libuuid-devel
 -
 -* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.96-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
  * Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 0.96-2
  - recompiling .py files against Python 2.7 (rhbz#623346)