[OpenImageIO/f15] sync with master

[Richard Shaw]

commit af16255f32e4f97597ecbb57c82fc0a35e0a6420
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Thu Nov 10 09:05:19 2011 -0600

    sync with master

 .gitignore       |    4 ----
 OpenImageIO.spec |    3 ---
 2 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index afcb8f7..0a67a9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,4 @@
 /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
-<<<<<<< HEAD
-clog
-=======
 /OpenImageIO-oiio-Release-0.10.3-0-ge93cd33.tar.gz
->>>>>>> master
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 9526a68..de44f4f 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -117,9 +117,6 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
 * Thu Aug 27 2011 Tom Callaway <spot at fedoraproject.org> - 0.10.2-1
 - Update to 0.10.2
 
-* Sat Aug 27 2011 Richard Shaw <hobbes1069 at gmail.com> - 0.10.1-3
-- rebuild for broken deps
-
 * Thu Aug 04 2011 Richard Shaw <hobbes1069 at gmail.com> - 0.10.1-2
 - New upstream release.
 - Fix private shared object provides with python library.