svnmerge from trunk for r70457 (sorry, I accidentally deleted the commit message)
1 file changed