Cooode/cocos2d-x — pull request #11 by Cooode (2013-05-29 08:08:52+00:00)
Title: merge

merge