Bug 1027024 - Never translate 'language' disappears when close/open translation infobar using a expired key - follow-up, r=mikedeboer.
Bug 1040697 - Prevent rule view marking all new properties as overridden r=bgrins
Properly handle unsupported value types in the console (bug 1039686). r=robcee
Properly deal with event handlers that the debugger cannot unwrap (bug 1041266). r=vporof
Bug 1041632 - Part 1: eliminating enclosing instance member access in BaseGeckoInterface. r=ckitching
Bug 1041632 - Part 2: eliminate enclosing instance member access of mProgressView in BrowserApp. r=ckitching
Bug 1041632 - Part 3: eliminate enclosing instance member access in EditBookmarkDialog. r=ckitching
Bug 1041632 - Part 4: eliminate enclosing instance member access in FilePickerResultHandler. r=ckitching
Bug 1041632 - Part 5: eliminate enclosing instance member access in FormAssistPopup. r=ckitching
Bug 1041632 - Part 6: eliminate enclosing instance member access in LightweightTheme. r=ckitching
Bug 1041632 - Part 7: make MemoryMonitor thread-safe. r=ckitching
Bug 1041632 - Part 8: eliminate enclosing instance member access in PrefsHelper. r=ckitching
Bug 1018240 - Part 1: reinitialize nsSearchService when the browser locale changes. r=adw

This patch makes nsSearchService watch for changes in the
general.useragent.locale pref, asynchronously reiniting itself when the pref
changes.

reinit-complete and reinit-failed events are broadcast on the usual search
service topic.
Bug 1018240 - Part 2: invalidate BrowserSearch engine list when locale has changed. r=bnicholson
Bug 1019719 - Localize the Sync client name. r=nalexander
Bug 1040806 - Default bookmark favicons are not displayed after browser restart. r=margaret
Bug 1019719 - Follow-up. r=me
Bug 1040336 - Uplift Add-on SDK to Firefox r=me

--HG--
rename : addon-sdk/source/test/fixtures/css-include-file.css => addon-sdk/source/test/fixtures/include-file.css
Bug 1041770 - Update missed reference. r=mrbkap

This was oversight from the landing of Bug 952201.  It manifested as:

E GeckoConsole(5812)          [JavaScript Error: "win is undefined" {file: "chrome://browser/content/browser.js" line: 5978}]

when trying to install a blocked add-on.
Merge fx-team to mozilla-central a=merge