# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110112134710-k1e2q8fowpfgxyb3 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: c2b3d88d108e592fa81c40f5035df7ad82027242 # timestamp: 2011-01-12 15:47:26 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110110134032-\ # o6wgi2cly5l7r6gy # # Begin bundle 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 QA==