sync with freebsd
drop cvs2svn prop
reset props for svn keywords
Update and sync with freebsd
Sync with upstream
This commit was generated by cvs2svn to compensate for changes in r2066, which included commits to RCS files with non-trunk default branches.