svn path=/stable/4/; revision=139058