svn path=/head/; revision=104859