# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@oracle.com-20110607171216-vn36tov1r3do77ua
# target_branch: file:///Users/mz/mysql/ndb-7.1-dbg64/
# testament_sha1: b811314cd1f054900e6ee911bfa6f2577a987239
# timestamp: 2011-06-07 10:12:22 -0700
# base_revision_id: martin.zaun@oracle.com-20110607141224-\
#   f0hfwytlvletvr02
# 
# Begin bundle
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


