svn path=/head/; revision=325705