SciTools/iris — pull request #164 by bblay (2012-10-19 13:01:38+00:00)
Title: Merge v1.0.x back into master

No conflicts!