# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110322123416-667jj4w2k08i9pfp # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: aaca1c7e607572a2a15aba352996771a63644171 # timestamp: 2011-03-22 14:35:50 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: kevin.lewis@oracle.com-20110318154814-\ # kjxi0lkisssxm2mw # # Begin bundle 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