svn path=/stable/6/; revision=152512