Oops. Yes, this should be merged to 6. This fix is necessary because of a change in the way soreceive works. I was under the impression that this only changed in HEAD, not in 6. re: Any chance I can MFC this before the freeze tomorrow?