Bug 925070, r=bz
Automatic merge