Merge r2492 and r2493 to branches/1.2. This doesn't change the...

tools/gyp/v8.gyp

 # Copyright 2009 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 236 matching lines @@
         '../../src/execution.cc',
         '../../src/execution.h',
         '../../src/factory.cc',
         '../../src/factory.h',
         '../../src/flag-definitions.h',
         '../../src/flags.cc',
         '../../src/flags.h',
         '../../src/frames-inl.h',
         '../../src/frames.cc',
         '../../src/frames.h',
+        '../../src/frame-element.cc',
         '../../src/frame-element.h',
         '../../src/func-name-inferrer.cc',
         '../../src/func-name-inferrer.h',
         '../../src/global-handles.cc',
         '../../src/global-handles.h',
         '../../src/globals.h',
         '../../src/handles-inl.h',
         '../../src/handles.cc',
         '../../src/handles.h',
         '../../src/hashmap.cc',
@@ skipping 260 matching lines @@
       ],
       'conditions': [
         [ 'OS=="win"', {
           # This could be gotten by not setting chromium_code, if that's OK.
           'defines': ['_CRT_SECURE_NO_WARNINGS'],
         }],
       ],
     },
   ],
 }