mono/MonoGame — pull request #687 by tomspilman (2012-08-17 23:52:57+00:00)
Title: Fixing Bad Merge

This fixes a few messed up elements from pull request....

https://github.com/mono/MonoGame/pull/686

Bad on my part for not looking at it closer before merging it.

Bad on GIT in that the default behavior when someone forgets to do 'git submodule update' is for it to look like a user change which often gets merged back into master.