# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101027065957-lx0nlsth2l750d1o # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: a94a02e06d1e8db6736060e0cd15129f8f17d59d # timestamp: 2010-10-27 10:07:02 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20101027064047-\ # ye93479yw0pw5yfe # # Begin bundle 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 KgZXc5ADkfoQ/x/L/w4Xxf/i7kinChIF2qlqAA==