# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110517122501-2nic8zdeknx5qkc4 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 32cbb7e2b5aa4922edadeeac008536e8fc04ff26 # timestamp: 2011-05-17 15:26:10 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110517114210-\ # e7dfx9z36r2tumzz # # Begin bundle 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