# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@sun.com-20090618075755-6mfa1dxzj9xel2m3
# target_branch: file:///home/oa136780/mysql/mysql-5.1-telco-7.0-spj/
# testament_sha1: 21523073f54550bfcb44382b48c8bc12c57b2da1
# timestamp: 2009-06-18 10:14:41 +0200
# source_branch: bzr+ssh://oaske@bk-internal.mysql.com/bzrroot/server\
#   /mysql-5.1-telco-7.0/
# base_revision_id: ole.john.aske@sun.com-20090612120112-\
#   0yz2t3hj6aa91arj
# 
# Begin bundle
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
i7kinChIZTcahQA=



