# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110426111422-1sr7sm4zhkok9d19 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: c1ec1b6c00bc8b1d16e00fdd0dd7731dbd0278fc # timestamp: 2011-04-26 14:14:30 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: inaam.rana@oracle.com-20110422203150-\ # pxdf539zqhhfmkt6 # # Begin bundle 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 6lzyiDAwu02nAlEyP8WfZ/xdyRThQkEiEPTM