# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20101109050246-yvyvfem6lenmzebf # target_branch: file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing-\ # merge/ # testament_sha1: 89f06eb02c4d49a9e7adc8ed8d0cbdcb9f0a2f93 # timestamp: 2010-11-09 06:03:14 +0100 # source_branch: file:///Users/malff/BZR_TREE/mysql-5.5-bugteam/ # base_revision_id: marc.alff@oracle.com-20101108193517-\ # gxb4xp1pb34jcmfs # # Begin bundle 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