# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20110111161330-c0ae2csdwa27qvcd # target_branch: file:///Users/mz/mysql/ndb-7.1/ # testament_sha1: a9023a557f05cfbb78237c41db850d4eea422358 # timestamp: 2011-01-11 08:13:46 -0800 # source_branch: file:///Users/mz/mysql/ndb-7.1-opt1/ # base_revision_id: magnus.blaudd@oracle.com-20110111084054-\ # ufs4inuk31u4tkay # # Begin bundle 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