# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@sun.com-20091019204051-vzd9hw55edxlxtke
# target_branch: file:///home/msvensson/mysql/bug37983/7.0/
# testament_sha1: a452ca0d0ff5471d7409d01d1294ec34645b1c1e
# timestamp: 2009-10-19 22:41:13 +0200
# source_branch: file:///home/msvensson/mysql/bug37983/6.3/
# base_revision_id: magnus.blaudd@sun.com-20091019115657-\
#   wkogm56zsvivswwl
# 
# Begin bundle
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


