svn path=/stable/12/; revision=351154