Commits

Quincey Koziol committed e7fa5fd6bbd
[svn-r18481] Description: A couple of tweaks to bring the "merging" branch into better sync with the metadata journaling branch. Tested on: Mac OS X/32 10.6.3 (amazon) w/debug, production & parallel (h5committest not required on this branch)