[OpenImageIO/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit 5abaf0b9de83ab0f9454b463fe6f8c364ea74d14
Merge: 78e6ddc 9a30ce9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Jan 23 14:12:11 2013 -0600

    Merge branch 'f18' into f17

 OpenImageIO.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---