cvs update
apply genugate diff for state removal
Merge branch 'divert-pcbdetach' of github.com:bluhm/sys into divert-pcbdetach