[svn-r18495] Description:

	Bring r18494 from trunk to 1.8 branch:

	Bring r18491 from metadata journaling "merging" branch to trunk:

	Extract data structure 'destroy' routines from metadata cache client
'destroy' callbacks.

Tested on:
	FreeBSD/32 6.3 (duty) w/debug
	(h5committested on trunk)

1 files changed, 0 insertions, 1 deletions

diff --git a/src/H5B2.c b/src/H5B2.c
index 0d7d86d..e268629 100644
--- a/src/H5B2.c
+++ b/src/H5B2.c
@@ -1263,7 +1263,6 @@ done:
     if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, hdr, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release v2 B-tree header")
 
-
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5B2_delete() */