Bug 1104925: update Yahoo search plugin for en-US, r=gavin/mconnor, a=gavin
Bug 1104846 - The search engine favicons are distorted in search preferences on Windows, r=felipe, a=lmandel
Bug 1104823 - Fix packaging of UITour FHR recording (modules.manifest renamed to browsermodules.manifest for clarity), r=felipe, a=gavin

--HG--
rename : browser/modules/modules.manifest => browser/modules/browsermodules.manifest
Bug 1104748 - A long default search provider name can mess up the layout of the one-off buttons when the panel is small, r=felipe, a=lmandel.
Bug 1104925: followup to fix tests, r+a=me
Merge mozilla-beta to b2g34. a=merge