# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@sun.com-20091007025619-7opglq0kotfnanc0
# target_branch: file:///Users/mz/mysql/ndb-7.0/
# testament_sha1: 6769b0ba8e34d90be4ce482c64d5b034aa7562c4
# timestamp: 2009-10-06 20:24:37 -0700
# source_branch: file:///Users/mz/mysql/ndb-7.0-bug23662/
# base_revision_id: magnus.blaudd@sun.com-20091006161617-\
#   n3fqmbdzmr3s7ua6
# 
# Begin bundle
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
Qbf1ojnHEjc3uZ4NzkGseo//F3JFOFCQVGcRwQ==



