# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110412075347-3r2u26m6iefjrg4e # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 133a349832c411c39beb45590159f6b6c1f2f2b5 # timestamp: 2011-04-12 10:54:58 +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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 OiMDERqsw3B/4NTA/+LuSKcKEgoPLBXA