Summary of changes: 4e892b0... Need to change ember.in not ember (*) 7b88f91... Merge branch 'master' into f16 (*) (*) This commit already existed in another branch; no separate mail sent