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