# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100629131219-pjbkpk5rsqztmw27 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 4a68a0a02ad5971ccb0bde8706b657c5743310a2 # timestamp: 2010-06-29 16:13:44 +0300 # base_revision_id: jimmy.yang@oracle.com-20100629024137-\ # 690sacm5sogruzvb # # Begin bundle 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