[OpenImageIO/el6: 49/49] Fix conflicts from merging with master.

[Richard Shaw]

commit 47d07a5c21dcca2577091140dfef096d410456ae
Merge: 8bfa9a3 39a295a
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Tue Oct 1 13:16:02 2013 -0500

    Fix conflicts from merging with master.

 .gitignore                               |   12 ++
 OpenImageIO-1.0.0-tbb_include.patch      |   13 --
 OpenImageIO-1.0.0-use_external_tbb.patch |   28 ----
 OpenImageIO.spec                         |  202 +++++++++++++++++++++++-------
 oiio-arm.patch                           |   16 +++
 oiio-hdf5.patch                          |   11 ++
 oiio-ppc.patch                           |   56 ++++++++
 oiio-s390.patch                          |   12 ++
 sources                                  |    2 +-
 9 files changed, 266 insertions(+), 86 deletions(-)
---