# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110125092438-yv6gwvmr8zv9zwqh # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 78fc15a3f710ea684466cc3c083664f29e7a3ef5 # timestamp: 2011-01-25 11:25:45 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: sunny.bains@oracle.com-20110125073738-\ # 55t4wl0he4eigs1w # # Begin bundle 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