# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110623125725-93rh2hi3ywnsm2mh # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # testament_sha1: 17f6818b38c4f0185be3ced0a1d7c98b9986e5c7 # timestamp: 2011-06-23 15:59:07 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # base_revision_id: marko.makela@oracle.com-20110623094019-\ # ed27kvpj7l27i0ru # # Begin bundle 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 3FjZB4ET/kqNSBT/xv+z/4u5IpwoSAnblcIA