hdf5_der

[svn-r21945] Updated to revision 21942 of the trunk

Resolved all conflicts and changes in function entry macros.

There may still be some issues with the manifest as bin/chkmanifest is 
behaving oddly.

Tested serial and parallel on Phoenix.