# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20110607141224-f0hfwytlvletvr02 # target_branch: file:///Users/mz/mysql/ndb-7.1-dbg64/ # testament_sha1: 7f04afabe63686d707439753c1aeb3683a5bc307 # timestamp: 2011-06-07 07:12:32 -0700 # base_revision_id: craig.russell@oracle.com-20110602214317-\ # 31g7j0m3wcawb98u # # Begin bundle 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