# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@oracle.com-20101221105310-2aq93spul5i5crqs # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk-\ # bugfixing/ # testament_sha1: bae45053f0370e6fa2dcca5e9c20fa640d82b42b # timestamp: 2010-12-21 12:53:30 +0200 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: sven.sandberg@oracle.com-20101221101402-\ # kvt8o8vyr7bg74yw # # Begin bundle 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 YYIVDLiOrUdEKZYhf/F3JFOFCQ3OJMAw