# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100624093926-ppek29jlli21ox7d # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: f748641de2febecf73d4c4d338cd2a7f039122ba # timestamp: 2010-06-24 12:39:38 +0300 # base_revision_id: jimmy.yang@oracle.com-20100624021010-\ # oh2hnp8e1xbaax6u # # Begin bundle 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 D7//F3JFOFCQ2h76MA==