Cooode/cocos2d-x — pull request #5 by Cooode (2013-03-11 01:43:08+00:00)
Title: Merge

Merge