Merge.
commit6391199d1420a7b6ab1de42dcf5f5aec8928fc00
authorAndreas Gal <gal@mozilla.com>
Wed, 24 Sep 2008 00:19:02 +0000 (23 17:19 -0700)
committerAndreas Gal <gal@mozilla.com>
Wed, 24 Sep 2008 00:19:02 +0000 (23 17:19 -0700)
tree0ee1e0890c757aeaa3ad33b63b3ad5db9779c41a
parent0dae058d3c29be59f12fa37ba6a26a24a458df05
parent50701990dfde1cce02dc88c390e86fbe0243178c
Merge.
js/src/jstracer.cpp