# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: roy.lyseng@oracle.com-20101109152916-0vdj2ymr3ujnsuu3
# target_branch: file:///home/rl136806/mysql/repo/mysql-work3/
# testament_sha1: de2ac8478aed1b90120f5b1fa6a92640d79eae5b
# timestamp: 2010-11-09 16:29:56 +0100
# base_revision_id: olav.sandstaa@oracle.com-20101108092858-\
#   xfeds9y2q8b1qxuo
# 
# Begin bundle
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
1GjMPd2dS4Mkfda6EHxTODsj/i7kinChITKwPvg=


