FYI, I've attached a patch that does what you suggested. I haven't doneanything else (i.e. testing) with it yet.
-- Abhijit