# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@sun.com-20090715200643-kggb6e73hsm7sc91
# target_branch: file:///home/msvensson/mysql/7.0/
# testament_sha1: 723c0b994fb45a4c9aa80c0ad8580c05f4e373d6
# timestamp: 2009-07-15 22:07:03 +0200
# source_branch: file:///home/msvensson/mysql/6.3/
# base_revision_id: magnus.blaudd@sun.com-20090714093143-\
#   5z3by9rxgbpvk6ku
# 
# Begin bundle
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
oSHdNYw+


