# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20100928082157-5lyf5ip07h1mbqdx # target_branch: file:///Users/mz/mysql/ndb-7.1/ # testament_sha1: 813f4e0ec4beefc39aa2f8535cb4d7f4b9d352df # timestamp: 2010-09-28 01:22:45 -0700 # source_branch: file:///Users/mz/mysql/ndb-7.1-opt1/ # base_revision_id: martin.zaun@oracle.com-20100928071226-\ # kq4slvxe45kuo39u # # Begin bundle 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 ajsOaAPyaKFHtthRP/F3JFOFCQxzuAEg