Merge mozilla-inbound and mozilla-central

browser/app/Makefile.in

build/mobile/robocop/FennecMochitestAssert.java.in

build/mobile/robocop/FennecNativeActions.java.in

build/mobile/robocop/FennecNativeDriver.java.in

build/mobile/robocop/FennecNativeElement.java.in

build/mobile/robocop/FennecTalosAssert.java.in

build/mobile/robocop/PaintedSurface.java.in

content/canvas/src/WebGLContextGL.cpp

content/canvas/src/WebGLContextValidate.cpp

dom/bindings/Codegen.py

dom/bindings/parser/WebIDL.py

dom/ipc/ContentChild.cpp

dom/ipc/ContentParent.cpp

dom/plugins/base/nsPluginHost.cpp

dom/plugins/base/nsPluginNativeWindowWin.cpp

gfx/gl/GLContext.cpp

gfx/gl/GLContext.h

gfx/layers/Makefile.in

gfx/layers/opengl/LayerManagerOGL.cpp

gfx/thebes/gfxPlatform.cpp