Synchronize to cocos2d-iphone v2.1rc0a