# 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:18:27 +0100
# source_branch: bzr+ssh://joreland@bk-internal.mysql.com/bzrroot\
#   /server/mysql-5.1-telco-7.0-spj/
# base_revision_id: ole.john.aske@sun.com-20091104105811-\
#   tf1pyxav7sfs1o9g
# 
# Begin bundle
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
3JFOFCQIwh59gA==



