# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20101002060743-aajgmbple2x0l5f6 # target_branch: file:///Users/mz/mysql/ndb-7.1-ndbjtie-fixes/ # testament_sha1: bf044e5d4b9812a2a8d3f67ab3c0eed83c3e796b # timestamp: 2010-10-01 23:07:50 -0700 # base_revision_id: jonas@mysql.com-20101001115202-dn80400wqlb9ki7u # # Begin bundle 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