# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@oracle.com-20110530093824-okvolsssp7rb22qd # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\ # mr-wl5569/ # testament_sha1: 09f6158186c2664e439fbe9af0da5dd2fb51c482 # timestamp: 2011-05-30 12:38:37 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: andrei.elkin@oracle.com-20110528104240-\ # ofiubd6s1y8b9m6e # # Begin bundle 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 DJmQo33g1P+LuSKcKEgiDmJrAA==