# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magne.mahre@sun.com-20091111160302-iwrto8wvoj81xlpr
# target_branch: file:///data/z/mysql-next-mr-runtime/
# testament_sha1: 983e155b16a3ba800cc22a5937f3d0164ae3cb51
# timestamp: 2009-11-11 17:03:09 +0100
# source_branch: file:///data/z/mysql-6.0-codebase-bugfixing/
# base_revision_id: davi.arnaut@sun.com-20091111003906-\
#   tabpixj21qhk22kf
# 
# Begin bundle
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
MsWk4xBFA0NrLe/MFX/i7kinChIUaeqaQA==



