# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.hansson@sun.com-20091103090304-b2nitiymsoitdi76
# target_branch: file:///data0/martin/bzr/bug47925/6.0bt/
# testament_sha1: 9ee7a4f847aa880f1b98025a77888dc088f5ca27
# timestamp: 2009-11-03 10:03:35 +0100
# source_branch: file:///data0/martin/bzr/bug47925/5.1bt/
# base_revision_id: vvaintroub@mysql.com-20091103004559-\
#   o9iautw6rrb1ldwo
# 
# Begin bundle
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
473M3xrcm1jMjGPZXChIcv+LuSKcKEgjXRRjgA==



