svn path=/head/; revision=26015