Merge remote-tracking branch 'origin/v0.6'

Conflicts:
	src/udp_wrap.cc

diff --cc deps/uv/include/uv-private/uv-win.h
Simple merge

diff --cc deps/uv/src/unix/linux.c
Simple merge

diff --cc deps/uv/src/unix/sunos.c
Simple merge

diff --cc deps/uv/test/test-fs-event.c
Simple merge

diff --cc deps/uv/test/test-list.h
index f5f0541,f6b58a6..4fcc055
--- 1/deps/uv/test/test-list.h
--- 2/deps/uv/test/test-list.h
+++ b/deps/uv/test/test-list.h
@@@ -118,14 -116,8 +119,15 @@@ TEST_DECLARE   (fs_event_unref
  TEST_DECLARE   (fs_readdir_empty_dir)
  TEST_DECLARE   (fs_readdir_file)
  TEST_DECLARE   (fs_open_dir)
+ TEST_DECLARE   (fs_rename_to_existing_file)
  TEST_DECLARE   (threadpool_queue_work_simple)
 +TEST_DECLARE   (threadpool_multiple_event_loops)
 +TEST_DECLARE   (thread_mutex)
 +TEST_DECLARE   (thread_rwlock)
 +TEST_DECLARE   (thread_create)
 +TEST_DECLARE   (thread_self)
 +TEST_DECLARE   (strlcpy)
 +TEST_DECLARE   (strlcat)
  TEST_DECLARE   (counters_init)
  #ifdef _WIN32
  TEST_DECLARE   (spawn_detect_pipe_name_collisions_on_windows)
@@@ -285,15 -273,10 +288,16 @@@ TASK_LIST_STAR
    TEST_ENTRY  (fs_readdir_empty_dir)
    TEST_ENTRY  (fs_readdir_file)
    TEST_ENTRY  (fs_open_dir)
+   TEST_ENTRY  (fs_rename_to_existing_file)
    TEST_ENTRY  (threadpool_queue_work_simple)
 +  TEST_ENTRY  (threadpool_multiple_event_loops)
 +  TEST_ENTRY  (thread_mutex)
 +  TEST_ENTRY  (thread_rwlock)
 +  TEST_ENTRY  (thread_create)
 +  TEST_ENTRY  (thread_self)
 +  TEST_ENTRY  (strlcpy)
 +  TEST_ENTRY  (strlcat)
    TEST_ENTRY  (counters_init)
 -
  #if 0
    /* These are for testing the test runner. */
    TEST_ENTRY  (fail_always)

diff --cc lib/repl.js
Simple merge

diff --cc src/node_crypto.cc
Simple merge

diff --cc src/udp_wrap.cc
index dce45ad,741e4ed..a6b7649
--- 1/src/udp_wrap.cc
--- 2/src/udp_wrap.cc
+++ b/src/udp_wrap.cc
@@@ -365,7 -364,8 +365,8 @@@ void UDPWrap::OnRecv(uv_udp_t* handle
    };
  
    if (nread == -1) {
 -    SetErrno(uv_last_error(uv_default_loop()));
 +    SetErrno(uv_last_error(Loop()));
+     ReleaseMemory(buf.base, NULL);
    }
    else {
      Local<Object> rinfo = Object::New();