svn path=/head/; revision=34724