# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: roy.lyseng@sun.com-20091105101323-288p72pykuo1h5f0
# target_branch: file:///home/rl136806/mysql/repo/mysql-6.0-linux/
# testament_sha1: 52a7b7e0931c24176f31811235c21575488d2fa6
# timestamp: 2009-11-05 11:16:14 +0100
# base_revision_id: holyfoot@mysql.com-20091104085700-29vmubo08flae2ek
# 
# Begin bundle
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
iT4YZdc6FNrrGXcPUXoI/4u5IpwoSB/jFYKA



