# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@oracle.com-20110212083205-a48u8h9mjqe1jejb # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\ # mr-wl5569/ # testament_sha1: 11bfd2fc71183f42f755b3b66245bc8f88049138 # timestamp: 2011-02-12 10:32:17 +0200 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: andrei.elkin@oracle.com-20110203092827-\ # kd9tg0kdsqtnrizu # # Begin bundle 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 5IpwoSG6wGd2