cocos2d/cocos2d-x — pull request #2889 by minggo (2013-06-14 06:46:34+00:00)
Title: merge master into develop

haven't done for vs project