Cooode/cocos2d-x — pull request #4 by Cooode (2013-03-05 08:00:30+00:00)
Title: merge

merge