# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@sun.com-20091008114121-6z6obmg67hjwf5rp
# target_branch: file:///home/msvensson/mysql/bug46113/6.3/
# testament_sha1: 3f7b88ab3b56c4f95a120408aca9fc6447de4866
# timestamp: 2009-10-08 13:41:43 +0200
# source_branch: file:///home/msvensson/mysql/bug46113/6.2/
# base_revision_id: jonas@mysql.com-20091008062459-tttdj45t93ip5p35
# 
# Begin bundle
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



