svn path=/head/; revision=115291