svn path=/head/; revision=356419