# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20101008111735-0cuzafmrp8jvh2p5 # target_branch: file:///Users/mz/mysql/ndb-7.1-opt64/ # testament_sha1: 2cd1f0f1b970621ac60f29f03d280120dabb353c # timestamp: 2010-10-08 04:17:42 -0700 # base_revision_id: martin.zaun@oracle.com-20101008111456-\ # hntp9zn28m7lx601 # # Begin bundle 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