# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@oracle.com-20110608180117-gawo3sh1imdxdarg # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\ # mr-wl5569/ # testament_sha1: 0209987533b89ce35cbf96e504d59ba46ce5c9bc # timestamp: 2011-06-08 21:01:26 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: andrei.elkin@oracle.com-20110606105119-\ # j8yk9b45uvirqvf4 # # Begin bundle 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