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

[Richard Shaw]

commit e486ab909e0514dcd6d971be0506c9145a6a7ccf
Merge: 6d30bf7 7a11365
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Sat Sep 22 09:57:17 2012 -0500

    Merge branch 'master' into f17

 .gitignore       |    1 +
 OpenImageIO.spec |   12 +++++++++---
 sources          |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---