# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100624104820-p4ojmxcmq8qeos6d # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 0db9382d67982aa93abd389a1614b7c3e6cc61e4 # timestamp: 2010-06-24 13:49:53 +0300 # base_revision_id: jimmy.yang@oracle.com-20100624021010-\ # oh2hnp8e1xbaax6u # # Begin bundle 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 8TObUPQx0Af/hrP3n9BdyRThQkJRK+JA