# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@oracle.com-20110608201808-h9279ue551ngalo9 # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\ # mr-wl5569/ # testament_sha1: 67f4a61c99bc23b2b3966211b910d84c79640fce # timestamp: 2011-06-08 23:18:15 +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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