Merge.
commit43db214ae04fbb3ca0b3361b3109331133b45669
authorDavid Anderson <danderson@mozilla.com>
Fri, 15 Aug 2008 00:28:32 +0000 (14 17:28 -0700)
committerDavid Anderson <danderson@mozilla.com>
Fri, 15 Aug 2008 00:28:32 +0000 (14 17:28 -0700)
tree9bebf54beb8bf7b61285609d599811aace978d24
parentb5ab0d81ead5a22f0c4adb8770fa371adc5e18e2
parent5a7e8e463abcc8797e1c3aea2e584cb1d427c290
Merge.
js/src/jstracer.cpp