Merge pull request #12 from Unity-Technologies/unity-4.1

Unity 4.1
Merge pull request #13 from Unity-Technologies/unity-trunk

Merge pull request #12 from Unity-Technologies/unity-4.1