# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@sun.com-20091108212004-vjz5p95da51q7ylu
# target_branch: file:///home/msvensson/mysql/7.0/
# testament_sha1: b5a8814635df5d9382f2311113db1554d58799a0
# timestamp: 2009-11-08 22:22:59 +0100
# source_branch: file:///home/msvensson/mysql/6.3/
# base_revision_id: magnus.blaudd@sun.com-20091108141704-\
#   b59z3u8dgi22hlvy
# 
# Begin bundle
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
uf/xdyRThQkHffnPcA==



