Merge mozilla-central into tracemonkey.
commita65d4c23a9b5dc062416f83d6c57f7ddfefd264a
authorChris Leary <cdleary@mozilla.com>
Tue, 4 Jan 2011 18:51:14 +0000 (4 10:51 -0800)
committerChris Leary <cdleary@mozilla.com>
Tue, 4 Jan 2011 18:51:14 +0000 (4 10:51 -0800)
tree038972d42dcf29dcbf80a4db52de02508a6b62ca
parent8b5e9b8588f8c5b26baf4d820d4a22f93947f81e
parent825cbe578bed2bead893e49185764c6b633080b7
Merge mozilla-central into tracemonkey.
caps/src/nsScriptSecurityManager.cpp
dom/base/nsDOMClassInfo.cpp
dom/src/jsurl/nsJSProtocolHandler.cpp
js/jetpack/JetpackActorCommon.cpp