# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@oracle.com-20110402113202-65e12tpteebi39g3 # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\ # mr-wl5569/ # testament_sha1: 9dab83b16ea5e8444ab36a05a5daf45e206b50b1 # timestamp: 2011-04-02 14:32:12 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: andrei.elkin@oracle.com-20110330141124-\ # et1jkewtcojpukkw # # Begin bundle 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