# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: alexander.nozdrin@oracle.com-20110425104516-\ # bzyqp1iccr0sfid2 # target_branch: file:///home/alik/MySQL/bzr/00/bug12362125/mysql-5.5-\ # bug12362125/ # testament_sha1: bb501164b1ec941cf2784897089c9a84ffcb9525 # timestamp: 2011-04-25 14:45:20 +0400 # base_revision_id: jon.hauglid@oracle.com-20110420103630-\ # wqkqx1u7jjw06jrh # # Begin bundle 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 HiLg