Merge the backout head.
commitc70f4fc52e55b9dcedffed42e0b21d1ff943cc22
authorChris Leary <cdleary@mozilla.com>
Fri, 28 Jan 2011 00:26:21 +0000 (27 16:26 -0800)
committerChris Leary <cdleary@mozilla.com>
Fri, 28 Jan 2011 00:26:21 +0000 (27 16:26 -0800)
treef53bf36c9fd5de104a144c530b179d9b79c03cf6
parent9d81e56c12c8492fc9b1f17375cf6c6fb1a69a67
parentf0d99d13a8a573a22756ac15dc3ba68e014479ee
Merge the backout head.
dom/base/nsJSEnvironment.cpp
js/src/jsapi.h
js/src/jsobj.cpp
js/src/jsobj.h
js/src/jsscope.h