# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@sun.com-20090909103532-b2a4s0lbrm4pno6g
# target_branch: file:///Users/magnus/mysql/7.0-test-mgmd/
# testament_sha1: a16350a8f97a16288863f8a5e48798d417f4eb42
# timestamp: 2009-09-09 12:35:56 +0200
# source_branch: file:///Users/magnus/mysql/7.0-dir/
# base_revision_id: magnus.blaudd@sun.com-20090909094004-\
#   i0ybvjoqnznhmfw9
# 
# Begin bundle
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
VLWQ



