# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@oracle.com-20110614103520-j8na6paqtqhx33w0 # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/MERGE/mysql-\ # next-mr-wl5569/ # testament_sha1: b341d1159d2bef1574e7dd7eb21e770bb987a79c # timestamp: 2011-06-14 13:35:31 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: andrei.elkin@oracle.com-20110614092738-\ # 5xnta7fh42l4m3xj # # Begin bundle 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 O0F7HwYawzq3omILtCbseQ8f/i7kinChIFSH2KY=