svn path=/head/; revision=268920