# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@oracle.com-20110317181310-ekvwso1nrtua16dn # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # testament_sha1: dc54ef344ababf88c6bf1fcca9841872dcdf1231 # timestamp: 2011-03-17 20:13:15 +0200 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk-\ # bugfixing/ # base_revision_id: chuck.bell@oracle.com-20110314184319-\ # z1h6n8s2rwcunm1l # # Begin bundle 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 +Bm9m82YBDIeYYXBiagtCXlP/F3JFOFCQuSN/8g=