[OpenImageIO/f16: 14/14] Fix conflicts from merge with f17 branch.

[Richard Shaw]

commit 6c3a8c236c65f2124612449d6e8884eff7872672
Merge: fb5ac2f 7d30ff8
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Thu Apr 19 14:08:04 2012 -0500

    Fix conflicts from merge with f17 branch.

 .gitignore                                |    6 +-
 FindTBB.cmake                             |  283 +++++++++++++++++++++++++++++
 OpenImageIO-0.10.3-use_external_tbb.patch |   74 ++++++++
 OpenImageIO-0.10.3-use_system_tbb.patch   |   25 ---
 OpenImageIO-0.10.4-no_tbb.patch           |   18 ++
 OpenImageIO.spec                          |   71 ++++++--
 sources                                   |    2 +-
 7 files changed, 432 insertions(+), 47 deletions(-)
---
diff --cc .gitignore
index 19a1146,7699fe1..d52a37b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,6 +1,1 @@@
--/OpenImageIO-oiio-Release-0.10.0-12-g8055b0f.tar.gz
--/OpenImageIO-oiio-Release-0.10.1-0-g8c102cf.tar.gz
--/OpenImageIO-oiio-Release-0.10.2-0-g7a6cba8.tar.gz
--/OpenImageIO-oiio-Release-0.10.3-0-ge93cd33.tar.gz
- clog
 -/OpenImageIO-oiio-Release-0.10.4-0-gad1950d.tar.gz
+ /OpenImageIO-oiio-Release-0.10.8-0-g1e37127.tar.gz