# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@sun.com-20091108211210-tf66yzhwsjitnx8q
# target_branch: file:///home/msvensson/mysql/bug37983/6.3/
# testament_sha1: e5448f3b234f9cc5fe74d67c5e314f2b5b38e463
# timestamp: 2009-11-08 22:12:16 +0100
# base_revision_id: jonas@mysql.com-20091022110933-p96bpxd18hqf18a9
# 
# Begin bundle
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



