Merge.
commit97a868c737f27f25c57c3bc23972b6a0e6874434
authorDavid Anderson <danderson@mozilla.com>
Wed, 20 Aug 2008 04:32:22 +0000 (19 21:32 -0700)
committerDavid Anderson <danderson@mozilla.com>
Wed, 20 Aug 2008 04:32:22 +0000 (19 21:32 -0700)
tree61a459bf5166def846b8b3124ec17b3b8e1f1f4a
parenta44bc58f906268f9f9dfe94c869cfea1a657f5eb
parentfeb32b31dc0546e40a5d41beae3bf7c130c927f4
Merge.
js/src/jstracer.cpp