[Tim said] > test_weakref.py fails now. Never mind -- I flubbed resolving one of "the conflicts" CVS insisted existed in classobject.c. Fixed now. All tests pass (but 24 are skipped on Windows). Still, keep your eyes open! Lots of code just changed.