I see that we haven't done $subject yet, so here's a patch. Assuming thereare no objections, I'll plan to apply it once the freeze is lifted(although this particular change probably needn't be subject to thefreeze).
-- nathan