# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magne.mahre@sun.com-20091104122002-zv00zbqe9kl0dt1n
# target_branch: file:///data/z/mysql-next-mr-runtime/
# testament_sha1: 3687af356d3c3fe7a90b9ca85902c87001084dd2
# timestamp: 2009-11-04 13:20:13 +0100
# source_branch: file:///data/z/mysql-6.0-codebase-bugfixing/
# base_revision_id: jon.hauglid@sun.com-20091104115946-\
#   k4e06i87jrjffu61
# 
# Begin bundle
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
Wejs2AqOu4xXQuC+jjssP/i7kinChIR3zL9w



