Cooode/cocos2d-x — pull request #7 by Cooode (2013-03-25 07:41:14+00:00)
Title: merge

merge