[openslide/el6: 4/4] Merge branch 'master' into el6

[Adam Goode]

commit bb2f3e83db94fb9753c9215a71d761981a4adb54
Merge: c4b4138 4e1484f
Author: Adam Goode <adam at spicenitz.org>
Date:   Mon Jan 16 21:34:49 2012 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	openslide.spec

 .gitignore     |    2 +-
 openslide.spec |   16 ++++++++++++++--
 sources        |    2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)
---
diff --cc openslide.spec
index a68caee,d5a0ed4..95f2013
--- a/openslide.spec
+++ b/openslide.spec
@@@ -78,9 -74,18 +78,21 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
+ * Mon Jan 16 2012 Adam Goode <adam at spicenitz.org> - 3.2.5-1
+ - New upstream release
+    + Support for MIRAX 1.03 files
+    + openslide_read_region now works for large dimensions
+    + quickhash-1 is disabled for unusual TIFFs where it is very slow
+ 
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.4-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
+ * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 3.2.4-2
+ - Rebuild for new libpng
+ 
 +* Fri Aug 12 2011 Adam Goode <adam at spicenitz.org> - 3.2.4-1.1
 +- Restore missing clean section (again)
 +
  * Fri Aug 12 2011 Adam Goode <adam at spicenitz.org> - 3.2.4-1
  - New upstream release, see http://github.com/openslide/openslide/blob/master/CHANGELOG.txt