Cooode/cocos2d-x — pull request #12 by Cooode (2013-06-08 02:53:34+00:00)
Title: merge

merge