svn path=/stable/7/; revision=205265