# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonas@mysql.com-20091104111217-5gs4rcrc7ggu3gie
# target_branch: file:///home/jonas/src/70-spj/
# testament_sha1: 3a2d8abd94dd0d6a1fe809c43e40f1677a01c082
# timestamp: 2009-11-04 12:12:30 +0100
# source_branch: bzr+ssh://joreland@bk-internal.mysql.com/bzrroot\
#   /server/mysql-5.1-telco-7.0-spj/
# base_revision_id: jonas@mysql.com-20091104111035-oa387go8psljvrxz
# 
# Begin bundle
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



