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