# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110406110744-cfuob3lfdp8bu6mo # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: e48519f7d896e3f26f0332eb4049671c2da4f61d # timestamp: 2011-04-06 14:08:21 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110406073710-\ # uo4c0b3ao6kf83ah # # Begin bundle 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