# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100514131050-mkhlvlui1u52irob # target_branch: file:///home/marko/innobase/dev/mysql-5.1-innodb2/ # testament_sha1: ade435bfb12b4c27a887545d623db1fadd0afc62 # timestamp: 2010-05-14 16:11:13 +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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