# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@oracle.com-20110324092705-\
#   l0fi0mvqklv358z1
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0/
# testament_sha1: a1f71182473f8844eb5e61880b9bdd43caf0466d
# timestamp: 2011-03-24 10:27:09 +0100
# base_revision_id: ole.john.aske@oracle.com-20110323131516-\
#   b31agywhlki5f0gb
# 
# Begin bundle
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


