svn path=/head/; revision=336680