track socket opts patch

[David Reid]

Folks,

I know we said we'd until after beta 1, but any objections if I commit the
patch over the next day or so?  Seems like it's a reasonable optimisation
that might as well be in the tree for people.

david