svn path=/head/; revision=128226