svn path=/head/; revision=269128