# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@oracle.com-20101108150443-rj3fhe0pgpnonx2s
# target_branch: file:///export/home/x/mysql-5.5-runtime-refactor/
# testament_sha1: 4fc44dc19b8b02500daec0eef56f0ded66f94ea6
# timestamp: 2010-11-08 16:04:51 +0100
# source_branch: file:///export/home/x/mysql-5.5-bugfixing/
# base_revision_id: jon.hauglid@oracle.com-20101108143704-\
#   oc90p0fl571p5dod
# 
# Begin bundle
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


