cocos2d/cocos2d-x — pull request #1358 by minggo (2012-09-21 09:04:46+00:00)
Title: merge Nicolas's pull request and do some bug fixes

Merge the pull request: https://github.com/cocos2d/cocos2d-x/pull/1336, and fix some bugs.