anchor.diff:  -include_lib("eunit/include/eunit.hrl").
   -endif.
   
  +-define(PID(WrappedPid), get_riakc_pid(WrappedPid)).
  +
   %% export Public API
   -compile(export_all).                           % SLF DEBUGGING ONLY!
   -export([
  -         abort_multipart_upload/4,
  +         abort_multipart_upload/4, abort_multipart_upload/5,
            calc_multipart_2i_dict/3,
            clean_multipart_unused_parts/1,
  -         complete_multipart_upload/5,
  -         initiate_multipart_upload/4,
  -         list_multipart_uploads/2,
  +         complete_multipart_upload/5, complete_multipart_upload/6,
  +         initiate_multipart_upload/4, initiate_multipart_upload/5,
  +         list_multipart_uploads/2, list_multipart_uploads/3,
            make_content_types_accepted/2,
            make_content_types_accepted/3,
            make_special_error/1,
            make_special_error/4,
            new_manifest/4,
  -         upload_part/6,
  +         upload_part/6, upload_part/7,
            upload_part_1blob/2,
            upload_part_finished/7,
            user_rec_to_3tuple/1,
  -         write_new_manifest/1
  +         write_new_manifest/1,
  +         write_new_manifest/2
           ]).
   
   %%%===================================================================
  
positive.code: %% must thread the MD5 value through upload_part_finished and update
  %% the ?MULTIPART_MANIFEST in a mergeable way.  {sigh}
  
  upload_part_finished(Bucket, Key, UploadId, _PartNumber, PartUUID,
      MD5, Caller) -> Extra = {PartUUID, MD5},
      do_part_common(upload_part_finished, Bucket, Key, UploadId,
      Caller, [{upload_part_finished, Extra}]).
  
  user_rec_to_3tuple(U) ->
      %% acl_owner3: {display name, canonical id, key id}
  
negative.code:                     ok = riak_cs_manifest_fsm:stop(ManiPid)
                  end
              after
                  wrap_close_riak_connection(RiakcPid)
              end;
          Else ->
              Else
  