Fix merge compilation errors git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1338 736b8ea6-26fd-11df-bfd4-992fa37f6226
2012-10-31T18:27:46