cocos2d/cocos2d-x — pull request #5024 by chengchen09 (2014-01-10 02:39:42+00:00)
Title: Merge pull request #1 from cocos2d/develop

merge from the cocos2d-x