hdf5_der

[svn-r21262] Description:
	Bring changes for "journaling" cache into "merging" branch, for
further merging into the trunk.

Tested on:
	Mac OS X/32 10.6.8 (amazon)
	(h5committest not required on this branch)