# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110609110038-cvwxeo05q0x4nsdk # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # testament_sha1: d0b2a480c0dab75a614c7b4d97fae870b9d73615 # timestamp: 2011-06-09 14:04:15 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # base_revision_id: alexander.nozdrin@oracle.com-20110609090318-\ # 06lrupk3f8wnz9ps # # Begin bundle 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