# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: alexander.nozdrin@oracle.com-20110425141229-\ # z5txne0w12a6jwk4 # target_branch: file:///home/alik/MySQL/bzr/00/bug12374486/mysql-5.5-\ # bug12374486/ # testament_sha1: 93317b0f1b811aef12c1aa552715988696f7bdb8 # timestamp: 2011-04-25 18:12:32 +0400 # base_revision_id: jon.hauglid@oracle.com-20110420103630-\ # wqkqx1u7jjw06jrh # # Begin bundle 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 iWZ6i/3cRzOb/4u5IpwoSDoMSi+A