Merge backout of bug 622480

browser/app/profile/firefox.js

browser/installer/Makefile.in

browser/installer/package-manifest.in

browser/installer/windows/nsis/defines.nsi.in

chrome/src/Makefile.in

chrome/src/nsChromeRegistry.cpp

chrome/src/nsChromeRegistryChrome.cpp

chrome/src/nsChromeRegistryChrome.h

chrome/test/Makefile.in

config/autoconf.mk.in

configure.in

content/base/src/Makefile.in

content/base/src/nsDocument.cpp

content/base/src/nsFrameLoader.cpp

content/base/src/nsFrameLoader.h

content/base/src/nsFrameMessageManager.cpp

content/base/src/nsGkAtomList.h

content/canvas/src/Makefile.in

content/canvas/src/nsCanvasRenderingContext2D.cpp

content/events/src/nsDOMEvent.cpp