# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110406073710-uo4c0b3ao6kf83ah # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 1447003bfc35619669be86b894c733b92635d41f # timestamp: 2011-04-06 10:40:29 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110406063525-\ # umeo92ottl1bmys1 # # Begin bundle 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 i7kinChINtZlYYA=