# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100520104042-ma2nsscqdvwoph8k # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: f9964de07368b75f9a0bf7b9c9fe3fcf04ab0caa # timestamp: 2010-05-20 13:40:52 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100519081618-\ # h38q02qxuvcowbtk # # Begin bundle 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