Merge remote-tracking branch 'ry/v0.10' into v0.10-mergev0.10-merge

Conflicts:
	AUTHORS
	ChangeLog
	deps/uv/ChangeLog
	deps/uv/config-unix.mk
	deps/uv/src/unix/stream.c
	deps/uv/src/version.c
	deps/uv/uv.gyp
	src/node.cc
	src/node_buffer.cc
	src/node_crypto.cc
	src/node_version.h
	src/stream_wrap.cc
	src/stream_wrap.h

1 files changed, 6 insertions, 0 deletions

diff --git a/src/node_buffer.h b/src/node_buffer.h
index 5743f9b26..7b7cf8e58 100644
--- a/src/node_buffer.h
+++ b/src/node_buffer.h
@@ -113,12 +113,18 @@ class NODE_EXTERN Buffer: public ObjectWrap {
 
   private:
   static v8::Handle<v8::Value> New(const v8::Arguments &args);
+
+  template <encoding encoding>
+  static v8::Handle<v8::Value> StringSlice(const v8::Arguments &args);
   static v8::Handle<v8::Value> BinarySlice(const v8::Arguments &args);
   static v8::Handle<v8::Value> AsciiSlice(const v8::Arguments &args);
   static v8::Handle<v8::Value> Base64Slice(const v8::Arguments &args);
   static v8::Handle<v8::Value> Utf8Slice(const v8::Arguments &args);
   static v8::Handle<v8::Value> Ucs2Slice(const v8::Arguments &args);
   static v8::Handle<v8::Value> HexSlice(const v8::Arguments &args);
+
+  template <encoding encoding>
+  static v8::Handle<v8::Value> StringWrite(const v8::Arguments &args);
   static v8::Handle<v8::Value> BinaryWrite(const v8::Arguments &args);
   static v8::Handle<v8::Value> Base64Write(const v8::Arguments &args);
   static v8::Handle<v8::Value> AsciiWrite(const v8::Arguments &args);