Fix svn merge spew.
1 file changed