sync with freebsd
drop cvs2svn prop
reset props for svn keywords
fix warnings & sync
Fix build
This commit was generated by cvs2svn to compensate for changes in r2069, which included commits to RCS files with non-trunk default branches.