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