LeiZeng/cocos2d-x — pull request #2 by LeiZeng (2013-02-16 03:17:45+00:00)
Title: merge the origin

rt