I'm not totally sure what's happening, but I've stumbled upon what seems to be some sort of error with the code for 'add_site_option' - when I add (or upgrade, which performs an add) a site option that isn't already defined, at it seems to be entering some sort of loop and eventually dying.
I can't quite figure out what's going on. Anyone seen anything similar?