hdf5_der

[svn-r22660] Description:
    Merge changes from trunk, up to r22659, to this branch, in preparation
for review and merge back to the trunk.

Tested on:
    Mac OSX/64 10.7.4 (amazon) w/gcc 4.7.x, C++, FORTRAN & threadsafe
    (h5committest not required on this branch)