svn path=/head/; revision=124660