# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@oracle.com-20100914162533-\
#   x8oezbwu9r9saj2j
# target_branch: file:///Users/mattiasj/mysql-bzr/b56659-55-bf/
# testament_sha1: b1b8d802a921df30a2a6c691d20fbe1431c1c437
# timestamp: 2010-09-14 18:25:45 +0200
# base_revision_id: tor.didriksen@oracle.com-20100910091038-\
#   eamj03nas42bt2e3
# 
# Begin bundle
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
SzNKFraS0dUuxZMPqf4u5IpwoSBiD15+


