hdf5_der

[svn-r20925] Merge with trunk.

This was done from a Windows VM, so configure is the trunk's copy.  I'll do a bin/reconfigure on jam later to make sure everything is in sync.