Merge branch 'patch-4' of git://github.com/smklinger/cocos2d-iphone into v3.0