I accidentally merged a ZEO branch into the trunk instead of into another branch. I'll clean up as soon as I figure out how. In the mean time, you probably don't want to use the ZEO trunk. Jeremy