bug 902091 - due to conflicts i only landed part of this patch. r=nthomas
Added tag FIREFOX_24_0b1_RELEASE for changeset 868dda8c4aad