# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110322113916-oricw02qg3tzvim8 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: e93268f1264c8441adff753583178553d7a692f2 # timestamp: 2011-03-22 14:45:23 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110315132451-\ # phdr7rtq5gce4947 # # Begin bundle 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 nChIR2JEIgA=