# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110412080743-8s5lwjnxoe8yveod # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: f23ed3a8d0cf093826d36ed5c97fd85740f32a47 # timestamp: 2011-04-12 11:09:06 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: sunny.bains@oracle.com-20110412012137-\ # fqao8q5x283ub8f6 # # Begin bundle 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