Fixing merge error with the setInitialScale

This commit is contained in:
Joe Bowser 2011-11-25 14:40:08 -08:00
commit feff655530

Diff Content Not Available