Trivial
Merge branch 'cocos2d-x-2.1.1' of https://github.com/sunzhuoshi/cocos2d-x into cocos2d-x-2.1.1