# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: andrei.elkin@oracle.com-20110219162633-graaj89ad7v88dlh
# target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\
#   mr-wl5569/
# testament_sha1: 25cc55f0c962d9ff490cf082c3b7ceb22cb1cc1f
# timestamp: 2011-02-19 18:26:43 +0200
# source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/
# base_revision_id: andrei.elkin@oracle.com-20110217195648-\
#   qr2w5j4q802celrj
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXLW0GcAJnVfgH10/P///3/n
/ur////+YCb+VCLBsF4AN9HwTztL4Oy7gAAHd8vD57SjG6c82MmZms7GQiSIAMHQ4+DDdLWVKa8A
AFS25OjKqdsjFtpZk2akylrWiTMbbY0MJJBNNARggCAJo0GoT9TEo0GyjQfpI9T1PTU9qm9U0Op/
lVE//fqfqqqjUwE9NJtBMATACBo0wmAAAAIVSb/9VVJ//qqk9QAGgAaBoGQAAAAAAAAan+lVFMp6
NSepo8p7SgbUAAA0AaAAAAAAIkkCYkGkYIwmgnkpmUyepo9TyjT1MjJoBoaYRkCpIgIAgARqZDTU
bJkmjUbU2k9QA0BoxDI0acz0UD88FXUa6/w8x/gn0fjySwV+NeSGMZMprO7up2R2yQqjya3V3adu
40uu+DF+zu1NS7zS2FXVRUoBsbnH8v0/P+fu+f5/U2r9owwy3Nbhqdhq/WiA9t8eWlnlRBtt1sCF
JjjcWouvs+KN7clSrvJYxcal+FFm3zlVM6wvPudvussrqU2m2kJxc0KEzMOePePHj3s3Vg5Q0mge
UsEmOzt48nTW5v9bHpUwV7FTdDHv7tGL0iDGFb+w7eOUO6v9H2nvcCRrABAyExRtJ8H2vXGEHs16
1Sf2a5we6UK1S98nPnOlzfkkkCxYAVdrpOAADLR/CNiF1IABV9cEtJ1yjyTvjB8QqHmiKHwxVDBP
rgoG/EcJd7ZTy1Q4kSo0QKS1rAloyL05dH6whvyBBhGFRpHMwMzfquxJmoEAB/P5nDju58N/PnKU
pSlKUpSlKUqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq
qqqqqqqqqqqq6vUzq76nTq9fu99n2Xo66nW3V5vAnj2PsE5APKBJJBkkkkWRkEyznhqPV+wIx7uN
WX+EaIHB7htrt2+qMYkmN9U5vsrRIpjSUVwH08HFmp84FDiVEAtfU62BSTKXyapiMpvUaCl9DVuc
5q2g1LM02g1NJGryfXTKnVw9msoteVmAbHDj0iAA7l60dPS1uvp8foizLO4wKPx24fZX+WHzxIN1
gABXg2WavE0PtNRFRnvexljGiZ/Fl6rIX7yvwv+vPe++Tfrn6y7z3YG6s12GWpcyYQoOKVJJJJJJ
JIAAMAAGAADAABgAAwAAYAAMAAGAADAABwAAAAAwAAYAAMAAGAADAABgAAwAAYAAMAAHAAAAADAA
BgAA4AAGAADAABgAAwAAYAAPD02Ntt6/zfpdPVzf9vL7309+697XNck+/VRvfFF+p7q3TEYoxdrd
ui6z7Z3U+RuZEKy5McueFbMExd+1fDwIDagGk40gGO3251oLqncRf70741Y9PkIqJQo2sPZhqnXz
HX8HaQdHOqUXWCO2WzRxsWum7LZUkQEABvkU8XV4QggACoti0MNpU13yikABs1mT69NYIbXitq1a
Qppfpss7jZOHjGs3uwzaGcz9DNn5dDGnkyZMnK1NPV5upq1VVVVVVVVVVVVVVVVVVVVVVVVVVVVV
VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVUu9auXTsWLBqO9qHpGmY5C/0RXbh5Y4Px9
2VN7Rouuu/fDE8kuP1HFjUwa4COsoxdDX149PcIJsCR5oDvYIw7fP6A6F6Id4Cgg0h99JKs9YwlM
JCRkJIBJBheEXzH10yL2Qy6UxVAK5XtMEAr5rEB6/OzAUxWS1KqfJCkQADptKLhmbcefuh28Smt7
/T6Z0jl6bIYlLVizpkAbbxlQgZLOVbFl72lSqfWyb8M8MTOzAAyAMOz7uisqzN1S2B43AA5FTH30
uSyrrw9zru42xoNj34+Ph6/Hw9O+UpSlKUpSlKqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq
qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqu0/n073p09zprp3n7eBqSbnuY0RXhU6BgDbc
+YDj4bO3sV33ZPyFdEEbYwHg6hfIXes9wCj61qhxhBXi3KmNZvWOkKke3MvU1MBklsmWq+VhW/CD
TxbDTlk9783+NPgFPw9S9l2mu3K17BubnfcHCXX4TCAhu9IriHCzZrgXAKqpkUpnjaO3VjNHQ6Fl
lLLdFW7rxex/Lsd/142A4AKZmZmMaAIAZ01rAEbAcAHLTMzMxGwHDMzMy6a1AI2A4ALNYAjYDgAs
1gCNgOACzWAI2A4ALNYAjYDgAs1gCNgOACzWAI2A4ALNYAjYDgAs1gCNgOACzWAI2A4ALNYAjYDg
As1gCNgOACzWAI2A4ALNYAjYDgAs1gCNgOACzWAI2A4ALNYAjYDgAs1gCNgOACzWAI2A4ALNYAjY
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
xrGGvA5QkJCEjqJ5LS1SqkIgRM9nb7BOG6L8QpvQAsP1Dse3XtgrensEACCABx/Ka/b7T5H7fP3s
kIhIST5z33DRPsjDZ/X89xnMQnw7zt335XflaHxH3/SWPeNFAoUPoWlbfRqT7ikzvrRtxdCl1kB2
jH9NtGrFGZk0lUw4n81dNUkEpomU2lhA1QCRYULXC79XZIrP9nxb6VnIfC8rtfAAAPZ8fh8Ph8Pf
7pSlKUpSlKUpSlKUqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq
rnOc5zlVVVVVVVVVVVVVedr+/Tyt6101011P16eN1unddNfh3uI9x2+oH9qh7k+YLj6eGEbk+Mpf
UoXoXlKF6nuLhOKOYkWRH5gmr7FDJDIS4WD7PabTG82Il0l4nK2dcsNaTfEADXUjIRkJCWTAUMGh
NVxOWMOaB1r/QgxDfV9YIAHLovK3YiRP709dvy6zuMltXaaH4EyZdg7fQJt729zSGaokDt8aq0kg
fh93HrqRWCCWvWAtP+gJucl83J9WBUcd6o/P5NvuSL0LM6P4AK3+CStFlq/GaBNdQhAA/ahI2967
q4y8rSQH+nzbo+96ZFIt+zLTbG3hqn4um5ALg+o4kHJipDD5bG50v+h4xQ1ZJHTYnIihuVPlEbey
Qbb2kQKEbsEeyGWXsK3UTVaasDiDJAAOZCv7yr8l8lp92tC6vHN4JZlT2Iuj8T2+BIid2g8IHsUS
ZAqJkF7QJUjKXeby4RDeu4PwU+xLxDsVfbXvU/XOLj57ipTMDWGVq45jvmdCt4XLw8G8HaTe4F7v
sPJnpBtWIIPLsj4S1TX4/GYpJ3b7yeonxkhYA9Y8rWiMe84M2E7Z8j1MVnJ6H2OlxZeDgcaV6DK4
oJH7ktbIQ2sgPS9aVkDVymLzVzqkVGt1M9nnz5fq6CvsFnJXa3S+tUz8osQ1hAz866qdZD0WeKq/
+plLsPRZgCigCryQl2mx1AQCRdI6ah0N5heQhIFVVctNhsVH61JUYwgPiJ9CMpf0t+bRSjMzMzMz
MzMzMzMzMzMzeW5ZmZmZmZmZm+RcszMzMzMzMzPNmszMzMzMzMzOMzMzMzMzMzOMzMzMzMzMzOMz
MzMzMzMzOMzMzMzMzMze41yzMzMzMzMzM4zMzMzMzMzM3TNZmZmZmZmZmZmZmZmZmZmZxmZmZmZm
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