Merge bleeding_edge from version 2.1.3 up to revision 4205...

include/v8.h

Index: include/v8.h
===================================================================
--- include/v8.h	(revision 4205)
+++ include/v8.h	(working copy)
@@ -2422,6 +2422,14 @@
   static int GetLogLines(int from_pos, char* dest_buf, int max_size);
 
   /**
+   * The minimum allowed size for a log lines buffer.  If the size of
+   * the buffer given will not be enough to hold a line of the maximum
+   * length, an attempt to find a log line end in GetLogLines will
+   * fail, and an empty result will be returned.
+   */
+  static const int kMinimumSizeForLogLinesBuffer = 2048;
+
+  /**
    * Retrieve the V8 thread id of the calling thread.
    *
    * The thread id for a thread should only be retrieved after the V8