Hi Mike,
I think this is a better way to do things, but it might be better to submit this patch against the current CVS rather than against CVS+previous patch.
I chose this way because it shows the changes more clearly. I can easily send the "combined" patch if this is desired.
Do you have any other issues/criticisms wrt to the stuff I sent?
Martin