svn path=/head/; revision=254603