Merge pull request #440 from mono-soc-2012/garyb/resources