svn path=/head/; revision=123286