svn path=/head/; revision=25544