# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20100419152658-8ox26c9t2lgoiras # target_branch: file:///Users/malff/BZR_TREE/mysql-6.0-codebase-\ # bugfixing-cleanup/ # testament_sha1: f2665f530a0655bc7a658cb90ab424c305d115a6 # timestamp: 2010-04-19 09:27:12 -0600 # source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing/ # base_revision_id: vvaintroub@mysql.com-20100419110732-\ # i0bd4qkvyuljikth # # Begin bundle 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