svn path=/head/; revision=314477