svn path=/head/; revision=134825