i just happened to do two anonymous "cvs update"s today and they worked fine. Worked just as I expected (including automatically incorporating some local source changes). I never did anything to convert over to the reported new tree structure. Thank you (and/or whoever) who got this fixed.