Merge.
commitfe0f07c6a0e8c3c752806b0da252f41055974f2f
authorDavid Anderson <danderson@mozilla.com>
Thu, 14 Aug 2008 00:11:22 +0000 (13 17:11 -0700)
committerDavid Anderson <danderson@mozilla.com>
Thu, 14 Aug 2008 00:11:22 +0000 (13 17:11 -0700)
tree1d048e77a53f79853943ec1e185815dac4c3b9c2
parent1048a03fc7963fa3240d25a3b4d91878b2c52433
parentadc7c8f54c3c96b6db53eacec69aadef26c59a27
Merge.
js/src/jstracer.cpp