# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100514130815-ym7j7cfu88ro6km4 # target_branch: file:///home/marko/innobase/dev/mysql-5.1-innodb2/ # testament_sha1: 01499d87058dc1ace88e835337e41f7c36a83124 # timestamp: 2010-05-14 16:08:25 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100514130228-\ # n3n42nw7ht78k0wn # # Begin bundle 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