svn path=/head/; revision=323763