Merge.
commitd3aca3dc5206430640e9287b64067c1c47e5caec
authorAndreas Gal <gal@mozilla.com>
Tue, 27 Apr 2010 02:07:10 +0000 (26 19:07 -0700)
committerAndreas Gal <gal@mozilla.com>
Tue, 27 Apr 2010 02:07:10 +0000 (26 19:07 -0700)
tree0e9c9ae6cb8d19b99f602dcb9df9c252ae7eadac
parent7cc8e791ebe938ff3ce952e1a57d35af06d080b3
parent483a9fe2ea8d215c76c771e322ac3f25add9f0e6
Merge.
js/src/jsapi.cpp
js/src/jscntxt.h
js/src/jsstr.cpp