# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@sun.com-20090925075729-989220mv4tjqopu0
# target_branch: file:///home/msvensson/mysql/7.0-testMgmd/
# testament_sha1: f127965cbf891f398751296e672caa2d34195fac
# timestamp: 2009-09-25 09:57:34 +0200
# source_branch: file:///home/msvensson/mysql/7.0/
# base_revision_id: magnus.blaudd@sun.com-20090925072749-\
#   jhy0okyj3zfs6u0v
# 
# Begin bundle
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
VaqJYqqOp/4u5IpwoSBf5sdo



