[ocaml-camlimages/el6: 17/18] Merge branch 'master' into el6

Mon Mar 12 13:10:42 UTC 2012

commit d23e07018c3d5c28ee7143982fcde3bae76cefad
Merge: aadc47a baa6cc3
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Mon Mar 12 08:09:17 2012 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	ocaml-camlimages.spec

 .gitignore                                         |    2 +
 camlimages-3.0.1-display-module.patch              |   52 ------
 camlimages-oversized-png-check-CVE-2009-2295.patch |   81 ---------
 ocaml-camlimages-libpng15.patch                    |   58 ++++++
 ocaml-camlimages.spec                              |  191 ++++----------------
 sources                                            |    2 +-
 6 files changed, 101 insertions(+), 285 deletions(-)
---