Merge.
commit24fa9690d018c6e517ed8b917c0a42f69fc74c12
authorDavid Anderson <danderson@mozilla.com>
Thu, 14 Aug 2008 00:12:08 +0000 (13 17:12 -0700)
committerDavid Anderson <danderson@mozilla.com>
Thu, 14 Aug 2008 00:12:08 +0000 (13 17:12 -0700)
tree974eefc246673e3bba997080b1894ea579a350db
parent838dd87a8ed5e122d29cf54f22ef9d5d878f4349
parentfe0f07c6a0e8c3c752806b0da252f41055974f2f
Merge.
js/src/jstracer.cpp