Uplift bug901449

https://bugzilla.mozilla.org/show_bug.cgi?id=901449