Hi David,

	Trying to get this merged, finally. I has whas has been
discussed so far and agreed wrt the timeout handling.

	There is a separate issues related to possibly delivering errors to
threads that haven't caused them, for that I'll send a separate patch in
a minute.

	Michael et al, if you guys could please take a last look at
this, lets try to get this finally merged :-)

- Arnaldo