bug 993963 - more yahoo changes, a=mconnor
bug 993963 - more yahoo changes, part 2+3, a=mconnor