# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@sun.com-20091118081550-l8gv8m2lodyil1uv
# target_branch: file:///export/home/didrik/mysqldev-6.0-codebase/6.0-\
#   codebase-bf-misc/
# testament_sha1: da943b5d6a0952308acabf9dd5dd2569202c9b3a
# timestamp: 2009-11-18 09:15:54 +0100
# base_revision_id: jorgen.loland@sun.com-20091118061420-\
#   kb4asp6ltdlehm8s
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXDBMx0ABNbfgFAwXff//3/v
37C////wYArufTct923joPXu7hwgbuzc9527wrOezesztj3nQklMgIJjTQmZNRtTyjRkmjQNANDI
NAAkomTUwDUwmonqPTU/SI9Q0PUAaGgAAAcAwjCaYhgEAyAGEaZMmEYCGgkRCU9DImhkp7UnppPR
6jTKep6E8ptTIaeUA9R6gCKRCmwptIaNNTNT1PERk2piBkAAAAAkkExAmEDUNJk9I0ynlPUGgDQN
D1GhptRjhXt+vhBQ1Zrza3KLundJpGsHDMMT/b9dzfRjHZJs5eJxgMPPox2fb/mqaut/omq5eBZU
MKN2T4Xu2wmrPC6Za67okSzNLimPHSGZ4R5K4RSKuMTVua1kYrwY0bF+6flzn4BYH6DJZl5E09KP
EOoGGTJmD2FnuFlHKPezR4j6rveMrniHdYb4fqIq9xlJihdEx2hlMKkHGav5H5TRt47hxiOp31KH
ZsLcyGQWM6MMgdpB4sEnA+1ZX69RWxm/pmefjPZ+SkMpfOklmUwzFDLptKpbLFwIE0tj1ugTamrF
hpt1EmuBSMMK/YUOCre+2+eggFbCswDE+AxTlg2tawqJgHsI9yMKxkYekzudJzO6/LVBeN47dBua
OILsGnc9/rKkhz7Z7iFArupmGwYeL19nFmdJaCDg+faR+lQ9vKyGUx3vSFQ00XgNVFt0ZNGxS1db
jw32a+Uy0SLTkvMq5x3VuUOjgcerAVTOt0i5p3J70k0LlDyKyZ0inI7lvrJf7wK9Z0XRc7zlBoaE
NCalG80WubRWmPyzsJfqCL+nIFtipil2pO2DRFF8UL18wzHIUKGsmsx4JChvPUKKRAePT1zSsPeR
BTKFJsIKMTE0EQoTP9PCh9RsnXiKu+ERQsBhw4YYT7qXCcmFMkm534EQCMUlZrVQodjHEvo7Oq+f
6ocTdEdEvQ7FMhnLHQC0Ce+kxK5ywtyYkpyY2SZi0eh1eSMGbJGoofQG8ZC84LGkzEH79G3hntqR
VyLWITpDDQvZhPOQ2lg0Nu2/MhdqHBOOl1UlffiKZsKYWJUkHVMyPXQtLV1grFfReBpRTOGRJhYO
eOCiI8+WsiYk1MyIUTbbDzKYQVSYkWk6F5UQeQNZbnl3LqUnGO+hDlyjWYIuaDKY8iuAT1DzgOjo
pbJ2JiJ2kieHQWNxIfhOFEo+s1fylNoUt+Gd85mbLcipagVclrwKFZ2q4qLNp5dGhiXApGt71kMt
BsKGm4iwsC6XnocmQqUXkpll0vNJkbcx8s2KsStoGjjLJTgNsID1G8fmqlzZEw91I0XUGGgvOWug
hG6ehRLHtVSuxRLWtCjw6qhYCCfhcOot2dsa4ycyfMmcB9l5w5DzNPCwoTNA7e3vJwFroSLihqJr
dQOpcJylFysyhATJJ8CsE4tkeqB0vkYnJZYQK2cZlDaCxBcVG+64WZcUsZIIPHc5vkRgA4qFvYzO
MDIqCOHEKRhe4q62mF71GwqIg9EHTGKgXNETbRRpbl/WM+EeDRLkgcEN+3QdC4fNCDna3+AMNk82
5lG2ZB62pGWbQdIM29qPX0zaJdqRTqmnT0DvUgtB1paTxD3ruCSq4juXaeB6Fu3NjbTbuO9Kx8Uf
7HHUmxQeBDouxr8HXK6h5LI1HoSYuKnmHkV5ky8+EAlAkTwJh5Baj5D+SlrSsaxy6KGIMh5ZqGd8
Fce4NQQCgN0G1xfilgeSv5EEhgeQOP+FEPL0NUicgehgI8NNlKDtrtDTftwm3OWjrxjycMWIrMEU
LalJgxB44MQ3F4RrqsGCAWpRGNhW6VaVNtQbUqTzRQGGJlgZzU/FRjcOc/RFcNPQN7V4/F+/AOvv
ByHDzbD3QpdSovIlJpohmH2SRJzImG7yI9J2kYjsPGRKPUegoUF0n+6DbdKldO8wNTeh1y94zJzh
SpQkqXcd4ZV2GOApSL36WLPTD1fBfGIUe6+uhahEj3vMuLLfYFk+ZMzUQlScs15iQWTVqXPxBwdp
iPie9fIsLCSc7TWtFBEFGXTVhCHgR3sLPXi03iZdaFa+3a5OXMOiXVEhBhgeKkoGjXsO1SjUW76C
59sm1NLG78n8awXcnxI0BGpfk1akmov2cfHXerKiO4joZg7d0HDoOKsCsUTiWrZQWA8qumCcrbyJ
adJ6yJIzNcyFNBgIOZ+2VHiTgsqwcLCE9DhVxhbnxcfbeRmDrc/FRh0Pa0Gi0F5rzywTDnLpZ9Bt
PXhlwud3nB2PLTW1iKpyVvgMRFEuh4EmqzrO7sVFNrN6TnJOWXKRqgtPzVGU0YYPMURUiFbRKGSY
hOIzvRNg0KDkqpm67M5slTAXG4Yc5fK/EMy5SUSSs38U1KRaVCL1Yilhw5McuAjBls0LgPOMSXvH
nf00L0RTzGtcgxEc44mL+lGbKirwCFYrgxg5EbX7jZcPFvTlSueXPNjJS2pQMx9+hcddw18LWERw
Ji+sRtXNqw5YyX+8VYLjUpNs5Ruj+WvPBjDE8oEUp+zIvM5feOVo6YTQqYVjpTlIo+RIgONqlq5d
1gBoM3eyFIYxyPRX4DCXEFxBe1hEyygs0seSfMZElJdfbN9ZGyYFOrsmZuFI6vGSzGFR5KVfDNvP
N4lBnkaVdKtsDleK52U0+MxnHMzuVvg3g7OnhZLdv3920XE04DKtplCoGkcTmxA5dhINOJlqdT3O
kblgIVg91ASMQRoQxgcDFbQXjT3BwyTcDFvY2eDW++tI4tTWJBwBWrnWwgoywAdmHe7mR3llybqt
NPgprrrRTZndiue8uouSebQt6bEp5cGYtNYkkDRsBDUcqaSRh/sS2mpSVg1PNR8GtlYsMoErmQQy
YLrCT0MrN3hngKoINlYgCuTpcja71m+6KZ89z1HC0oNq7Sdue4FdwiqU5SghzJgDnaHhJkZoYB7M
E7EEdSemJLBQXKs9Ozu1mzP8ZyDYCI1dPDN4buzyi8gwLZkTRpSI8afUbbk0v0p7SyxMHUDKqtSr
KGmhz4x025p7bXtZ5s4yWk0mjfI0wOYupXByVmZnIqYDgmDBXDec6dRMydUgvhnfhbJW9hXfT4rR
yqNXfoqjZXWGIpLx5pKxAyYTTY5t5AgXDFbvCMd951J8xvS63mjwFi8erVQRadgly6ca1eayUakb
5hYYiQldXXpFq1rNvrqDjeERDhxERvrRuk4NtaGAzECeqUtupYNU0/wJRjPI6G0wdN1hvM2OhVEY
mh31R1Mz09XNrY69wB4b+qdxcFtMAG3qtJx6VqomxlEhHmfBSNQeqsmPyiA+8TvWu7bHsImocoP/
7cdAmDBLYp6Dbx86yoeOYW7VuDlIQrnsWDer2Szes8vwTayNE7AiBT7Vlep6cKrkJVuLTb0gobLx
jWiGtzTwU4W1qaxSHIcuOtI9bsK1Np4ayhdbXdjK5TlRsuOJWMvV6lKUxC6i2DUyGgaSuRma0q3F
qorbSAa9DJ63BVZnb28rEuGKacLBb8yZDeNQ0ZlPX3qj/i7kinChIOGCZjo=



