# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100614063501-k55k1188wsovx36r # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 8a4aeab3831462bd93ae6604e00bf704e9ba64b2 # timestamp: 2010-06-14 09:35:14 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100608122645-\ # psnrclg7j7n1ynvs # # Begin bundle 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 /2K4