Push string shape fixes to trunk (version 0.4.3.1).

src/heap.h

Index: src/heap.h
===================================================================
--- src/heap.h	(revision 695)
+++ src/heap.h	(working copy)
@@ -495,9 +495,7 @@
   // failed.
   // Please note this does not perform a garbage collection.
   static Object* AllocateConsString(String* first,
-                                    StringShape first_shape,
-                                    String* second,
-                                    StringShape second_shape);
+                                    String* second);
 
   // Allocates a new sliced string object which is a slice of an underlying
   // string buffer stretching from the index start (inclusive) to the index
@@ -506,7 +504,6 @@
   // failed.
   // Please note this does not perform a garbage collection.
   static Object* AllocateSlicedString(String* buffer,
-                                      StringShape buffer_shape,
                                       int start,
                                       int end);