Cooode/cocos2d-x — pull request #2 by Cooode (2013-01-29 02:35:27+00:00)
Title: Merge

Merge