Dave,
Same as before:
If there is no objections on this approach, please apply this patch.
Against net-2.6.20

cheers,
jamal