Comment 4 for bug 388746

This looks like a different patch to the one Steve Grubb sent to the ML earlier this year (attached), could you review the differences?

I would be nervous about introducing the patch without similar support for 0.5/trunk, as otherwise that'd be dropping features