Merge m-c to inbound on a CLOSED TREE.

CLOBBER

accessible/tests/mochitest/events/test_focus_general.html

accessible/tests/mochitest/events/test_menu.xul

addon-sdk/source/test/test-ui-button.js

browser/app/profile/firefox.js

browser/base/content/browser-addons.js

browser/base/content/browser-appmenu.inc

browser/base/content/browser-customization.js

browser/base/content/browser-feeds.js

browser/base/content/browser-fullScreen.js

browser/base/content/browser-fullZoom.js

browser/base/content/browser-menubar.inc

browser/base/content/browser-places.js

browser/base/content/browser-sets.inc

browser/base/content/browser-social.js

browser/base/content/browser-tabview.js

browser/base/content/browser.css

browser/base/content/browser.js

browser/base/content/browser.xul

browser/base/content/global-scripts.inc