r142001 - /branches/gcc-4_2-branch/gcc/testsuit...

[jason@gcc.gnu.org]

Author: jason
Date: Wed Nov 19 13:34:50 2008
New Revision: 142001

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=142001
Log:
fix merge markers

Modified:
    branches/gcc-4_2-branch/gcc/testsuite/ChangeLog