# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@oracle.com-20110108054451-49lkrr5j1ayr6i0t
# target_branch: file:///Users/mz/mysql/ndb-7.1-dbg64/
# testament_sha1: ed3d87955f6c0e81e5d155cce812d5ceb789c146
# timestamp: 2011-01-07 21:44:57 -0800
# base_revision_id: martin.zaun@oracle.com-20110108054307-\
#   hmq4hepuwzlyz8u1
# 
# Begin bundle
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


