svn path=/head/; revision=266979