# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101020115325-awy8g543bms81hhz # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 923b483bb4f77e41a4b4ca452e96cdf0496b5622 # timestamp: 2010-10-20 14:54:43 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20101020103435-\ # stzwo66g76u1zqfz # # Begin bundle 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 W4A=