Merge globus_xio-3.8 from CVS