# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexander.nozdrin@oracle.com-20101113150502-\
#   abp0zbmiftvp4xtb
# target_branch: file:///home/alik/MySQL/bzr/00/bug56934/mysql-5.5-\
#   bugteam-bug56934/
# testament_sha1: d0565034fd302e4151d3040288b10342cb7c08a7
# timestamp: 2010-11-13 18:05:07 +0300
# base_revision_id: joerg@mysql.com-20101112212255-l36c6ib48w6l40qg
# 
# Begin bundle
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
x/8XckU4UJBT2wpB


