From: Ryan Dahl <ry@tinyclouds.org>
Date: Tue, 6 Dec 2011 19:50:54 +0000 (-0800)
Subject: Merge remote branch 'origin/v0.6'
X-Git-Tag: v0.7.0~138
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=20035931433a87e53d3726ec86fd5eedfed2c3fb;p=platform%2Fupstream%2Fnodejs.git

Merge remote branch 'origin/v0.6'

Conflicts:
	deps/v8/src/debug.cc
	deps/v8/src/version.cc
	src/node_version.h
---

20035931433a87e53d3726ec86fd5eedfed2c3fb
diff --cc deps/v8/test/mjsunit/mjsunit.status
index cdac99b,bae09b4..b77ebca
--- a/deps/v8/test/mjsunit/mjsunit.status
+++ b/deps/v8/test/mjsunit/mjsunit.status
@@@ -34,15 -34,11 +34,19 @@@ bugs: FAI
  # Fails.
  regress/regress-1119: FAIL
  
+ #############################################################################
+ # Fails due to r10102 which reverts precise stepping on the 3.6 branch.
+ debug-step-2: FAIL
+ 
  ##############################################################################
 +
 +# Issue 1845: http://code.google.com/p/v8/issues/detail?id=1845
 +harmony/proxies-example-membrane: SKIP
 +
 +# NewGC: BUG(1719) slow to collect arrays over several contexts.
 +regress/regress-524: SKIP
 +
 +##############################################################################
  # Too slow in debug mode with --stress-opt
  compiler/regress-stacktrace-methods: PASS, SKIP if $mode == debug
  compiler/regress-funcaller: PASS, SKIP if $mode == debug