svn merge -r r22040:22205 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/hl Tested: jam (gnu and intel compilers)