# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@oracle.com-20110617153416-hk6xi35y36toougb # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\ # mr-wl5569/ # testament_sha1: c287243a59d59203bda64804ca89757acac5f19f # timestamp: 2011-06-17 18:34:39 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: andrei.elkin@oracle.com-20110617110041-\ # v6uzg0jwcu2em7t6 # # Begin bundle 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