# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101102073833-s7eog0k996huirn2 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: a158dc766fd84796fe0bd1690c9af75da1ad4cde # timestamp: 2010-11-02 09:40:05 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20101101085131-\ # zd19vt66oe800wbz # # Begin bundle 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