# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110119104456-ngjuyqs8fs3610ch # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 0bbaf1bfe536e8bb3e46c5c9a93d1ae6ace3a8a6 # timestamp: 2011-01-19 12:46:13 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110119101911-\ # yy9ctmpapof21kl3 # # Begin bundle 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 woSDx4DLyA==