imageworks/OpenShadingLanguage — pull request #354 by lgritz (2014-04-22 23:01:35+00:00)
Title: Fix IlmBase 2.1 build breakages

(other minor changes are due to syncing with the analogous file in OIIO)

The analogous OIIO review is here: https://github.com/OpenImageIO/oiio/pull/842