Merge pull request #2 from cocos2d/develop

Merge from trunk