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