# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20110702100908-j66g79miigd89o8f # target_branch: file:///Users/mz/mysql/ndb-7.1-jtie/ # testament_sha1: 7b3503a2fbd585d65da4d012cd5bb38f5df3c8bc # timestamp: 2011-07-02 03:09:30 -0700 # base_revision_id: maitrayi.sabaratnam@oracle.com-20110701175353-\ # is57kd0av272f2tn # # Begin bundle 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