# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110405111854-2x7cmsl3dzr530ue # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 910f3c563c995d6c4b0f6bdd4465eec3a9f5b325 # timestamp: 2011-04-05 14:20:00 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110405105837-\ # iws0lgom87igpx1t # # Begin bundle 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 luJgFzhgD+L3t/i7kinChIYhYvx4