Merge mozilla-central to fx-team

CLOBBER

browser/app/profile/firefox.js

browser/base/content/browser.css

browser/base/content/browser.xul

browser/base/content/popup-notifications.inc

browser/base/content/tabbrowser.xml

browser/base/content/urlbarBindings.xml

browser/components/nsBrowserGlue.js

browser/components/preferences/in-content/advanced.js

browser/components/preferences/in-content/advanced.xul

browser/components/sessionstore/SessionHistory.jsm

browser/components/sessionstore/SessionStore.jsm

browser/components/sessionstore/TabAttributes.jsm

browser/components/sessionstore/TabState.jsm

browser/components/sessionstore/Utils.jsm

browser/components/sessionstore/test/browser_attributes.js

...er/components/sessionstore/test/browser_label_and_icon.js

browser/config/tooltool-manifests/win32/releng.manifest

browser/config/tooltool-manifests/win64/releng.manifest

browser/locales/en-US/chrome/browser/browser.dtd