Merge revision 6928 to trunk, fixes assertion bug hit by webkit tests in debu...

src/assembler.h

Index: src/assembler.h
===================================================================
--- src/assembler.h	(revision 6942)
+++ src/assembler.h	(working copy)
@@ -184,10 +184,10 @@
   // we do not normally record relocation info.
   static const char* kFillerCommentString;
 
-  // The size of a comment is equal to tree bytes for the extra tagged pc +
-  // the tag for the data, and kPointerSize for the actual pointer to the
+  // The minimum size of a comment is equal to three bytes for the extra tagged
+  // pc + the tag for the data, and kPointerSize for the actual pointer to the
   // comment.
-  static const int kRelocCommentSize = 3 + kPointerSize;
+  static const int kMinRelocCommentSize = 3 + kPointerSize;
 
   // The maximum size for a call instruction including pc-jump.
   static const int kMaxCallSize = 6;