Reverted r83142: bad svnmerge
3 files changed