# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20100826145439-n7pgguk55sxo8bzv # target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\ # merge/ # testament_sha1: 9307bf9c7412c5edd6304e37abeeb25ce7582bb7 # timestamp: 2010-08-26 08:54:56 -0600 # source_branch: file:///home/malff/BZR_TREE/mysql-5.5-bugfixing/ # base_revision_id: bar@mysql.com-20100826130629-cfmub8mkaf893q4w # # Begin bundle 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 9KZb