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

[Richard Shaw]

commit 78e6ddc0928b49ffbb8c9582cf1e5ec2ac682875
Merge: e486ab9 e6ffb53
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Thu Jan 17 10:28:03 2013 -0600

    Merge branch 'f18' into f17

 .gitignore       |    1 +
 OpenImageIO.spec |   46 ++++++++++++++++++++++++++++++++++------------
 sources          |    2 +-
 3 files changed, 36 insertions(+), 13 deletions(-)
---