# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20100419122842-uoj9tyqxp1wvtdwb
# target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing-\
#   cleanup/
# testament_sha1: e21f339d0fa35b03af28a2d4256235a652e5b73c
# timestamp: 2010-04-19 06:29:10 -0600
# base_revision_id: vvaintroub@mysql.com-20100419110551-\
#   jzjkqyd8hz5zr0tf
# 
# Begin bundle
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
ZkUbPtJ4+3jDiP9KPjX7iCNXTRm1eJpu+8LPtN9u2bW7R8P9sfEVS3SScXSx6Xc5nsndFfguai7V
4NDRGVLSaWWWO/x73vqrb64mg0iukbUX5aMbaaZo0fM40XvcDescEu5LoRvoPde9ziX7XyuV6nhb
s09b5NXsbPF0vFqbnIzST8Ptms/Z+7R8KNlElmj9k2bVddNNNd/Dhs3UXfwms1XY1S5cJFHKTNhu
m5Tb6JUZrtHDC7dNqqokzXbE3KsRECZywqyTaM2b+f53VcLOmSrphw2YdNGajdNmzM3T6iTxumut
CEZu30vduupo2cHpc7hVDsdTxkuRyUX8UXpvpRflJeRdVF7nm+LPWt8+KDSK8H5Nz5W3SVatXXUW
i57/Lx/A9r9JV678Ul8ftjM1buvQq8UuWKPql6qi8LSKPZUtp2+VF+K09LtdtUt575LdUXg8ZUtk
ePqvyFda6fyc0H38j4NzleFB40Hav94/pFG6i4I9Tsd/wo40XD7Hd+iy2ij6b7zj58lzrtFd997i
256L+zSw54TrlL7W5fZLoivepdloSstKLFWUrCMWLRy3+2VQ2ouVfo12osXY87+PRet+jpci+16o
6WujGJJ/Xoivv9976L/D77m5Syi0Y0aUu8bpop6Dz55LRepe/DTGY5X4NDqXF+8pbxqyODjJfB4O
9/s48GXAlpA4x0SX8O5c9Q5BW9i5n2aWz1LZ95S8GiX03wcFvitJlUfvwar68P6+d71ngss8+i7T
stZKdixzUH0aLkj+9Fp+150XsJXAV1U+Oi7uU0u/od/4v2P3S9P7yl2vNgvMl2Pk+NS3v+8kl4L8
aLF6R5N4PCiIiIiIiIiIiIiIjy93k67dLupdm2t2XS3itb2tTvt1F7vgdLPXkxmZlhjp4WrWUsYv
+0XIUn4OEI6rFS7aLrfw0ouxla3nc0Dk66LdRZxp0ro3aDQ3q2w0WRWjmGHzbKLebqVovK000lNO
f7S+KppqJzopSspUnKciaqSiqcUiD9dNzDGKbSmTIxixHxbjWK8N1FwWMFpJZJfGgyi+cUb0uFSx
eLw7F1r70cx+qWLmWN5c1zitJNrFqPmS20XxouXs4MOg1senyq2r7Ly3Su7at121btt6noQYDBjA
UQGDBjAbt1X5V0cnayi9qi4vrft2xRznh4GiuQ+7lXQK617bSPylLFrMXGi9dF7jRmbZaaaLa21O
RTm3LWIx3i/e2Oi6jyo6z8/THzc3wcq6lbowl+ZuesWvbxvYdK161mE40XBaI0XF6mtB9j3+OOv6
vk50ek6f3ijx/udEpfOKO+j5dd4uc7e+2SXRdzVg1sezv2auS/F7VyXI33Mw+hLuWXztnF8LndXw
yjlo9X6NSXucrk3Wrpe9/e5oo//F3JFOFCQs7iqrQA==


