svn path=/head/; revision=241508