# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@sun.com-20090518111132-b19f3o98ea4ugou7
# target_branch: file:///home/msvensson/mysql/7.0/
# testament_sha1: 36be8a5c449bc8f868aea29458ee85dd9efda389
# timestamp: 2009-05-18 13:11:47 +0200
# source_branch: file:///home/msvensson/mysql/6.4/
# base_revision_id: magnus.blaudd@sun.com-20090518105751-\
#   uuvqnoylallcervq
# 
# Begin bundle
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
/sL9



