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