These files should have been merged in r61643
2 files changed