Bug 1094293 - Setup user properly on 10.10 - r=jlund
Merging from default

--HG--
branch : production