# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100630095510-g6fw2z0s1mo8gav5 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: b3d97a895b64c46fdd68d1d0285cff21d2bd1ad2 # timestamp: 2010-06-30 12:58:15 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: mark.leith@oracle.com-20100630091104-\ # yxpjqu3ruebif2jb # # Begin bundle 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 kJ5gHlo=