Merge branch 'v0.6'

Conflicts:
	deps/uv/include/uv-private/uv-unix.h
	deps/uv/include/uv-private/uv-win.h
	deps/uv/src/uv-common.c
	deps/uv/src/win/fs.c
	src/process_wrap.cc

diff --cc common.gypi
index 5dde273,daa64d3..8b3e7c2
--- 1/common.gypi
--- 2/common.gypi
+++ b/common.gypi
@@@ -30,9 -19,15 +30,9 @@@
          ],
          'msvs_settings': {
            'VCCLCompilerTool': {
 -            'target_conditions': [
 -              ['library=="static_library"', {
 -                'RuntimeLibrary': 1, # static debug
 -              }, {
 -                'RuntimeLibrary': 3, # DLL debug
 -              }],
 -            ],
 +            'RuntimeLibrary': 1, # static debug
              'Optimization': 0, # /Od, no optimization
-             'MinimalRebuild': 'true',
+             'MinimalRebuild': 'false',
              'OmitFramePointers': 'false',
              'BasicRuntimeChecks': 3, # /RTC1
            },

diff --cc doc/api/child_process.markdown
Simple merge

diff --cc lib/child_process.js
Simple merge

diff --cc src/process_wrap.cc
index aee9a01,4a43437..08453f8
--- 1/src/process_wrap.cc
--- 2/src/process_wrap.cc
+++ b/src/process_wrap.cc
@@@ -53,8 -53,9 +53,10 @@@ using v8::TryCatch
  using v8::Context;
  using v8::Arguments;
  using v8::Integer;
+ using v8::Exception;
+ using v8::ThrowException;
  
 +static Persistent<String> onexit_sym;
  
  class ProcessWrap : public HandleWrap {
   public:
@@@ -128,14 -161,14 +162,14 @@@
      }
  
      // options.cwd
-     Local<Value> cwd_v = js_options->Get(String::New("cwd"));
+     Local<Value> cwd_v = js_options->Get(String::NewSymbol("cwd"));
      String::Utf8Value cwd(cwd_v->IsString() ? cwd_v : Local<Value>());
 -      if (cwd.length() > 0) {
 +    if (cwd.length() > 0) {
        options.cwd = *cwd;
 -      }
 +    }
  
      // options.env
-     Local<Value> env_v = js_options->Get(String::New("envPairs"));
+     Local<Value> env_v = js_options->Get(String::NewSymbol("envPairs"));
      if (!env_v.IsEmpty() && env_v->IsArray()) {
        Local<Array> env = Local<Array>::Cast(env_v);
        int envc = env->Length();