svn path=/stable/11/; revision=338612