# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110124125226-tecjgoda8urz5lkn # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: bf559dadc2392aabc07b9c09050ec8722dd95986 # timestamp: 2011-01-24 14:52:34 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110124113909-\ # su51eevrekov0bgt # # Begin bundle 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 gA==