merged revision 274 of threaded_io branch in trunk