Merge bleeding_edge revision 2969 and 2980 to trunk.

include/v8.h

Index: include/v8.h
===================================================================
--- include/v8.h	(revision 2985)
+++ include/v8.h	(working copy)
@@ -1205,8 +1205,15 @@
    * If result.IsEmpty() no real property was located in the prototype chain.
    * This means interceptors in the prototype chain are not called.
    */
-  Handle<Value> GetRealNamedPropertyInPrototypeChain(Handle<String> key);
+  Local<Value> GetRealNamedPropertyInPrototypeChain(Handle<String> key);
 
+  /**
+   * If result.IsEmpty() no real property was located on the object or
+   * in the prototype chain.
+   * This means interceptors in the prototype chain are not called.
+   */
+  Local<Value> GetRealNamedProperty(Handle<String> key);
+
   /** Tests for a named lookup interceptor.*/
   bool HasNamedLookupInterceptor();