# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: oystein.grovlen@sun.com-20091118173615-rrnp7diedel0le1n
# target_branch: file:///home/oysteing/mysql/mysql-6.0-codebase-\
#   bugfixing-2/
# testament_sha1: 11905237b528d61eecd875852900b7cffdb2713e
# timestamp: 2009-11-18 18:36:21 +0100
# base_revision_id: tor.didriksen@sun.com-20091118150615-\
#   csn3i1sri0bhhabl
# 
# Begin bundle
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
mk5H



