svn merge -r24929:25009 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran tested: jam (gnu)
svn merge -r23351:24650 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran . Tested: jam (gcc, intel), koala (gcc)
Tested: jam (gnu, intel)