r189034 - in /branches/google/gcc-4_6-mobile/vt...

[llozano@gcc.gnu.org]

Author: llozano
Date: Thu Jun 28 01:13:40 2012
New Revision: 189034

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=189034
Log:
Fixed merge problem

Modified:
    branches/google/gcc-4_6-mobile/vtable-security/libstdc++-v3/libsupc++/vtv_malloc.cc

Changes in other areas also in this revision:
Modified:
    branches/google/gcc-4_6-mobile/vtable-security/ChangeLog.vtable-security