svn path=/head/; revision=227023