Tony> If no-one objects, I'll package this together on Thursday (NZ time).
One other thing. Most of the scripts still refer to themselves internally
by their pre-sb_ names. I suspect some of the stuff in contrib and
testtools which uses them needs to be changed as well.
Skip