Merge mozilla-central and tracemonkey. (a=blockers)
commit2cf5c0a6bd063ea4ba20b54b45667b7a98007480
authorChris Leary <cdleary@mozilla.com>
Thu, 17 Feb 2011 23:30:14 +0000 (17 15:30 -0800)
committerChris Leary <cdleary@mozilla.com>
Thu, 17 Feb 2011 23:30:14 +0000 (17 15:30 -0800)
tree76dfd85c60e2a68256416057f3f9428cc25fa540
parent804c9db8513b967450c560bfe31aa41086bfac9a
parentdc86a580d3f2f05422d6b521d3640bb742c19d83
Merge mozilla-central and tracemonkey. (a=blockers)