svn path=/head/; revision=232984