Merge production->default
Bug 1058073 - set file_shasum earlier - r=bustage

--HG--
extra : transplant_source : up%22%A9%AAE%94%AA%22%94J%3E%EF%9A%FEd%83%8E%E9%A9
Merging from default

changeset:   3103:4ef4e0feeb52
parent:      3100:916fd25c7692
parent:      3099:4148c2a93b1b
user:        Chris Cooper <ccooper@deadsquid.com>
date:        Mon Aug 25 17:39:49 2014 -0400
summary:     Merge production->default

changeset:   3106:b10bdb7c278b
tag:         tip
parent:      3103:4ef4e0feeb52
user:        Chris Cooper <ccooper@deadsquid.com>
date:        Mon Aug 25 17:34:54 2014 -0400
summary:     Bug 1058073 - set file_shasum earlier - r=bustage

--HG--
branch : production