# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@sun.com-20091102125237-p48i8jugu5tjy3wt
# target_branch: file:///home/msvensson/mysql/bug48301/6.3/
# testament_sha1: d23d011b6006b2af8f868acc8cfe240e6e24b051
# timestamp: 2009-11-02 13:52:42 +0100
# base_revision_id: magnus.blaudd@sun.com-20091029083529-\
#   qtaex8kbvvscxcnp
# 
# Begin bundle
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
gQmLayGBxnP+Q2JZpEyEUPRX/i7kinChIKTmnco=



