# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@oracle.com-20110614103206-tk937fo2wtkq8cm0 # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/MERGE/mysql-\ # next-mr-wl5569/ # testament_sha1: c565c678b15bc976095a5eeb4efdb385f27396cd # timestamp: 2011-06-14 13:32:19 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: andrei.elkin@oracle.com-20110614100121-\ # xmhcom29wjqpvoym # # Begin bundle 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