# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100512104212-e2h9n1obxjb8tfg4 # target_branch: file:///home/marko/innobase/dev/mysql-5.1-innodb2/ # testament_sha1: 14430fef1f95711d61e991947370a4f1669f334e # timestamp: 2010-05-12 13:42:21 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100512060922-\ # oh716ugpukfakwvh # # Begin bundle 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