[OpenImageIO/f17: 17/17] Merge branch 'master' into f17

[Richard Shaw]

commit 92560e2635bd25eea97d95ea40066ec8a6cc28e8
Merge: 8f5c66c f84394c
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Wed Jun 13 16:19:28 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	OpenImageIO.spec

 OpenImageIO.spec |   69 +++++++++++++++++++++++++++--------------------------
 1 files changed, 35 insertions(+), 34 deletions(-)
---