Commits

Quincey Koziol committed 4d9201cdca6
[svn-r18046] Description: Bring r18045 from trunk to 1.8 branch: Slush changes back & forth between trunk, the merging branch and the metadata journaling branch to level them out to a reasonably common set of code to work from for the next set of more significant changes. Tested on: FreeBSD/32 6.3 (duty) w/debug (h5committested on trunk)