cocos2d/cocos2d-html5 — pull request #1018 by MarkEHenderson (2013-07-22 18:38:56+00:00)
Title: Fix handling of contentScaleFactor != 1

This contains fixes for Sprite, scale9Sprite, and LabelTTF when the contentScaleFactor is set to 2. labelBMFont and other types of nodes have not been tested.

If the contentScaleFactor is 1 (which template/main.js will always set it to as written) this patch should not cause any changes.