# 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:52 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: alfranio.correia@oracle.com-20110613060455-\ # j0irr1fc6ezc1qyo # # Begin bundle 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 4H/BBvg5P/F3JFOFCQJjGWLg