svn path=/stable/9/; revision=294763