[libjpeg-turbo/f14/master: 7/7] Merge remote-tracking branch 'origin/master' into f14

[Adam Tkac]

commit f88b0512738d0f1cee9554c5ca359459c2e831f9
Merge: 22b08e0 9864955
Author: Adam Tkac <atkac at redhat.com>
Date:   Tue Mar 22 15:09:35 2011 +0100

    Merge remote-tracking branch 'origin/master' into f14
    
    Conflicts:
    	libjpeg-turbo.spec
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

 .gitignore                           |    2 ++
 libjpeg-turbo.spec                   |   27 +++++++++++++++++++++++----
 libjpeg-turbo11-noinst_jpgtest.patch |   14 ++++++++++++++
 ljt11-rh688712.patch                 |   24 ++++++++++++++++++++++++
 sources                              |    2 +-
 5 files changed, 64 insertions(+), 5 deletions(-)
---
diff --cc libjpeg-turbo.spec
index 8f20681,a589470..bb53b2c
--- a/libjpeg-turbo.spec
+++ b/libjpeg-turbo.spec
@@@ -131,7 -137,23 +137,20 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/libjpeg.a
  
  %changelog
+ * Tue Mar 22 2011 Adam Tkac <atkac redhat com> 1.1.0-2
+ - handle broken JPEGs better (#688712)
+ 
+ * Tue Mar 01 2011 Adam Tkac <atkac redhat com> 1.1.0-1
+ - update to 1.1.0
+ 
 -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.90-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
+ * Mon Jan 17 2011 Adam Tkac <atkac redhat com> 1.0.90-1
+ - update to 1.0.90
+ - libjpeg-turbo10-rh639672.patch merged
+ 
+ * Fri Oct 29 2010 Adam Tkac <atkac redhat com> 1.0.1-3
+ - add support for arithmetic coded files into decoder (#639672)
+ 
 -* Wed Sep 29 2010 jkeating - 1.0.1-2
 +* Wed Sep 29 2010 jkeating - 1.0.1-1.1
  - Rebuilt for gcc bug 634757
  
  * Mon Sep 13 2010 Adam Tkac <atkac redhat com> 1.0.1-1