Merge remote-tracking branch 'upstream/v0.10'

Conflicts:
	AUTHORS
	ChangeLog
	deps/v8/src/api.cc
	deps/v8/src/unicode-inl.h
	deps/v8/src/unicode.h
	lib/_stream_readable.js
	lib/http.js
	src/cares_wrap.cc
	src/node.cc
	src/node_crypto.cc
	src/node_dtrace.cc
	src/node_file.cc
	src/node_stat_watcher.cc
	src/node_version.h
	src/process_wrap.cc
	src/string_bytes.cc
	src/string_bytes.h
	src/udp_wrap.cc
	src/util.h
	test/simple/test-buffer.js
	test/simple/test-stream2-compatibility.js

1 files changed, 4 insertions, 4 deletions

diff --git a/src/udp_wrap.cc b/src/udp_wrap.cc
index c1bc6a7311..b392e35785 100644
--- a/src/udp_wrap.cc
+++ b/src/udp_wrap.cc
@@ -155,7 +155,7 @@ void UDPWrap::DoBind(const FunctionCallbackInfo<Value>& args, int family) {
   // bind(ip, port, flags)
   assert(args.Length() == 3);
 
-  String::Utf8Value address(args[0]);
+  node::Utf8Value address(args[0]);
   const int port = args[1]->Uint32Value();
   const int flags = args[2]->Uint32Value();
   char addr[sizeof(sockaddr_in6)];
@@ -219,8 +219,8 @@ void UDPWrap::SetMembership(const FunctionCallbackInfo<Value>& args,
 
   assert(args.Length() == 2);
 
-  String::Utf8Value address(args[0]);
-  String::Utf8Value iface(args[1]);
+  node::Utf8Value address(args[0]);
+  node::Utf8Value iface(args[1]);
 
   const char* iface_cstr = *iface;
   if (args[1]->IsUndefined() || args[1]->IsNull()) {
@@ -265,7 +265,7 @@ void UDPWrap::DoSend(const FunctionCallbackInfo<Value>& args, int family) {
   size_t offset = args[2]->Uint32Value();
   size_t length = args[3]->Uint32Value();
   const unsigned short port = args[4]->Uint32Value();
-  String::Utf8Value address(args[5]);
+  node::Utf8Value address(args[5]);
   const bool have_callback = args[6]->IsTrue();
 
   assert(offset < Buffer::Length(buffer_obj));