# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@sun.com-20091009092033-gprdp2ybxvszwade
# target_branch: file:///home/msvensson/mysql/7.0/
# testament_sha1: 9f335ea319cac30a6a4658e4d201a44418a38fc1
# timestamp: 2009-10-09 11:20:46 +0200
# source_branch: file:///home/msvensson/mysql/6.3/
# base_revision_id: magnus.blaudd@sun.com-20091009081944-\
#   z5qefiif7lhl3yp2
# 
# Begin bundle
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



