Bug 1024250; r=bz