# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexander.barkov@oracle.com-20110121134643-\
#   b8jrv2zl926uv04q
# target_branch: file:///home/bar/mysql-bzr/mysql-5.5.b31384/
# testament_sha1: 59684ddef5646a90695d3152a38533d854397e7f
# timestamp: 2011-01-21 16:46:47 +0300
# base_revision_id: martin.hansson@oracle.com-20110120122811-\
#   ko4u8sf72seqzw3h
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRb0ycEAE1b/gHAwABR59///
/+f/4P////pgF99773n332+2vvemvnsqXrUCM20NC2qnvZoGm9t7j2ansIqs87L3ta5sbs5aO66u
N25K5ZEzezTvcz23tgJJFMCDTSaGDRoptT8omwgQGmgNAA0GjQSUgJ6YmphUeU2KeUeFPUaaaaAB
k0aGjQAPUA0jU3qTUmahppoGygBoGQGRiZABkAaDBEiJGhBGT1J6GgptpT2k1Gnqeo8oGZTQBo0A
yAikgaI0DIEaTTyKnqfiI9KeptRspp+qZB6n6NSHqaND1BFIIAjQJggIyaqexqEnqPU8nqQHqeoe
ppkAHqWpwh/uiwEgYBX8gT+kDlVO/xQklAZzQwnhE1CBJ1haQKSg8oMRpMAmDySSfMSSXJePwSlP
JPFKkhIEoS7LEQMGMYhiN3Q4RARSIlWx+o56iZm21pa7gFo39ciHPO6w9w9w9vvvyR9t7J+SbF/Y
7s9vdO5bE/r1kGzKx0WXHvGC+zmPw+xLzvIElzIbJY1P5IYO3TmUqx6EcCGR7EXwCaBlWAQEVQlA
JR2GMaUFHakaUWWbJV9WALFQbucJ0EgEnRN00okCS9SN/6Rakk0T6hmN5E6NiB64CVEcch0ElVQ/
anHbaQI92TUHPjpktVrQ105Q6mWtkVdUPjdAyTjoIFSlvhAJ4QyVCFENNfq5RtYGZ7vmnnNO2t+M
K9Yn5CaxIMkjJJJJJIEkgHk+cXsxr2AIfT4vBmoyWDIlEzJiakSRhEQOiR7ikznqwPYs+AhluD1E
IYDFVpezRLwXHbDWrvEDEMQ35rM31KvWt0yyP93shz5BaxUbni9Ig7ICDlDr8O0Uwmo2fcTtsaaj
4iGJw9absAtWA2AMf6JRNVOnOc5yJ0SSVhMBD6thRMAeJsMQSD2DOuCE+Kn94hITJODv+UcZ2gli
TDXhotjjvwxuj0Ij2MouX7YuiMJfK+4iMa6s7669potT6xKX6UjTtAQkJr1W7nW0DK41Es7WsfgL
JvIjNCa8RQUFRJAvC3LLSI1yi8z1SiFnI/AsBuwu6Fn45CFBtBPpia8Ne/AbCW4OmF3RDCWiaQnx
iJeVrV2EmmjR4Rgfp17XbNg23JS2Hkr3qcuiKTnwIbAzMpRhuJpt/pEST34HWc7jHfoANeopGEQC
eUSRIveh9Um8Q8ADAYMDA/QBDhVPIQ/QQ9BCBCfD96HWUii/Bu61JrtgioIf8gO+2ywgMMo7dWFK
uf53dff+Ey/29BmCRPqJBINAxKqqSkpP0ieBNAO+FfOtg2jAP1Vf2iExCRu56zV6xh/HI/J/PnEK
HD07NTxG8qq+CvRnImRMiUlJSdfKbR1M7Ae6MGAwGAwYOWtvNd94PyMH8I9QKn1AqZvB7CGGQsMP
zRCO8M2LdvQp6APMD7wysY7MkqlLHO7Rj1aelOvsaw92A6Dfpcb2aQ/Lf07pb8N/DVhX8dJ/ZpdK
aj1AvcArEABMC2HwTh27OromONNNtNtVd18HsewTp4acgns3sSkb9GEoBt3Jmn5gTQkJv6dKJ3pv
uSUbAWoJIFRNIpe06sghsc+cTUgIaGA+9JE1UlbDA7jJZ/QyewshSFHo5q1mmZRrDm4Z3bNC1VN/
NQ7VIuFLKFaRCM5pZ2DtIJnQ85AN9GywwGRBMXuZBIJBCOxg6KTRDCUkCg2FtoQIIQghEyMTI2Zr
xgNGocCt9l3wDvm4sswBUwZZZX/0bsdYKmu81SZJTKQ+JClVxhJWOqIKksMPxLSt5kYXlmvC0qQb
J9EzBOaSEw05A7e1ZEi7KCZPKcT1YDIBqQAN0YCFs3JDXRDARtVxx/MzDORJScDCLGuVVCkhnyk9
Bu3xTTnLDFvZKu4bmvGkdbSVAOiPstdDcasOHL3UsywgDCZo4FvP9wGZA0B07tmvC/XFI169s42F
pcZGwKSAZXIFg9aYdQbrX4kFUacOBqKsdZpc7mIKnMVNWg8MSZ/4sHWUDFpe7zM3RAcJCp2x/hTQ
vLz278zqJm1TkZKRfFxzK7Y8Aeok9goeFE1J2ic7zvmqY7BLEyTUkhOlNP3WcXgwylnvLviYUvv4
0FMTJqhBD5pyV/YAhNRNTztC1DWH2VKzDuLBoA3wpo7obQ0pxzFaELCde3ZhoxYhe2gyRC66yrUb
BPHUJSvkRIKhL/4mdgDF5hnYaXA2WS6GllXHAwJGBkIfzibMee0Tsh1lEZ1DmIUEOdEwO/M8DUcM
jIoYEzIgqna2FhtLDvfNxYcF9QHrxLs9IiIEgMaSi3EVJ0nWgIbgHgUAWwTR9KOoh2iGBCCHUU2E
OUhA27wTdRO+SHwXuqdKUiZkICU09wQhMKIfETFmcy8utNQZZ2g4IbEJhXPxi8EKwxY1v1xM8+Bc
A9TF94WzcxyMa3VAhchoSLoEMaAcSU8AtsRCwZ0DUFoQmRCsN5DWHYbSolhf6HQEPg0tT6Ah6Wtm
lwmekGzaNNkojSzaMgsS4snNoRDtLEaN51KjMpx3VNhDcA+znrcDWdZTNeRgbAn9VNJW6AKmsrJ9
mAIKeSq8fOTWQoI5n3q0wEc++xJyQ1vYIEhGSGJVqRF4uHGp0YQzLCkihNwwrQqqFNdw0tYnPdXp
TEo6XZ9LsIuK7PQwkBDUpvOVfEsJmo5tfe5BXeFBLLDFvPA2tC4tz23Pu6GPiGlthOciajFgmGxu
DMjSXl5bnlKiBUdyBwdZ6O/FaztqKpVhnHGUS5eFI0pbLoQUl2XTOJsbb3CwuMINRbibzuBywbTt
LwG0pcWU7ZbJkiwkSNZLjmcyRXAiIv6hSlu6YOV+B2m0NZtJHdW4uDAqbT9XzanJgcg1gPK04YFk
sMqyik7eV0rdcAqUb2N1qm1+Hha4jabdYX0a4550c62RvM7SuBMQoeYQ2l+WBYhediTNnJlBnnNL
3BoROG8gxIsKCpmhaCiGTPXFTNvtKCsvujh48noHkArVSZRq2CmvW4PEM9uHS+TYW3AqUlNJbyjI
JQ5nS0u7LBC0NCc1iPO+V5TKIteh03lS4uNhMuvOBoGykRBeXXQIE5UQKBhCl8zykvhcSk7SWAy0
qLCUdKTFmpv5hhAHyO4Q4Cbc8NtTf0y8XsEpStDXmV4ay65xcTFkwwaAMzQoYhuM7THMrhfSM6Wp
DwmMLhyRoYXMe9Rc91BMwpKy8xa5S0uLMjwHow9vRosw1CYghtJa8BUoDMa4Csbd9UMWhON5qwva
hpvqtxTcEtHe50MA6IVWyrUyZvZpLkwjVTyL+U64Z6qPNCt/oGkoYMSJZ0+pT4P2Z2bD2WNMCaid
dXUZCmBQhIuhHUjg8wjRlYhqQwrqGS7ABmFrVLTbWYhhB6RW9U94/RT6AIeKeCMlgcoANJ/sQxQP
3CIH5oP4kgGs5DBH0VQ59aEkEkn6lTQ01i7PgIc62D8ibRodAGY0JSCTU6wErJiFUgHOcJWD8JJU
JoNUkiUNAUkiUNFCUNAPwm5SIOB+42Cd9A/cn2UdJYhQgFKEJP+p3UDfUB2oPQByS0ZEAIQpCDHM
BkpaXElUNaDkxM+ZMKV2lhvUL7EiEiEiEvH5lQD8kyYFgCGcAf5pbmSn4wUREsU2gIQr4KmADpVT
6FJanysTgc4DlEGpIPWlAFyQAhQCQAPp5ah4DV+Q/i7uhqxGFDqgdDwGY0EQvkADqS4BuKDkMxwL
ATogJ30LDcsJsg1APBBzHIQyJJVUxRDiAMNo94CElBdCwBmRmIvTYlyQJUqhvLQTYXIMgBzAQtXg
OJLEBsMASAHg9pRTuP4EikICYBxXtTxfSPfC+ypPFZez0RHrJxalULOaWoBeQCVgRhot5Afd7fhc
hfBaJAEXFI1E+IQ9yRNTABfJYNgnImwUN4oUpyEAgtQCzaJS4wliThJJJJ30FSgYmDJD0VCRWS8y
avUcZx1nsJCs5R44nHHF8MKMgIxdP3BXEwnRjEkWRocaTFPccnIcxxcm8rRGZGSfh0h5n45CtgBm
feXKQJL6RpE6/LFMqanhE3mOorihq9iL5u48WqA+sIj4uAlcbAdT26KOQeZ5hDuCaB6IQrlBt+P/
irNU1GW46VPtT3JIE4pqkiBWhXqACMx3fJMDlRBu6T5FHGSGoiVZFZKyIyhGQjhxnFUApe8GSj5J
idTxdR8Le4oeB2lpI3EmH7Hx+n32LiepVO7k6RTy5trQ6r5rkKYvFDswPUmTChKUSRgXZnYcjvOV
5U7ipNqXvsd2BcXmFheQULTIcC71MoVQlKcipH5y3dLxbx3LmlOagCb4gsQO1O3jcUg6Ikknd9z7
2lEAniXvab39ZmYMxQ8c0cO9I19vZZaeb1djxA50e4nPCQfR7Zy1Xa1VNVJdVbVU1+By6AQk4w2y
/Pjj7hM+J8h3MeHbkl1iQVRlnYNoG0jBMChHKK4BcBRnEWysqJdWw9TQ48taJaawUI1momAm4+Nv
euZB3qwkAJCQA7zYUfoJze44Ft2fEEk6It/VSdaEIX923qdHJP43TflZx4OH19KhJPROibE8UpMC
VgS0+XJ24TQTz4qVoJ0lnz1r0k5ddRCyucuaSiUcTqnm2DzEXkbEzTKCkww83twu5ceBuzylkmwy
KFhcbSUihxEOHUSQnDZA8oCUjinISFDUjJJEKzSxLyWnsnn56YlXWbTlQpXOiLOhNaxUXHYnyWHk
FtgYxwWU1VWl5ubkw+kloZpwRmB6eZixhA5d+VbfFanZtTqxCQcOfAIVrqnDl/b7zzbk+iQnhawD
8nAkDZi9hPY+TOhd68YiiL2VI7mrtSe6j3Zw1TJabM7t1CVgxA0AhSCTCYKSSaLl8y1FqqWcwTZ7
YEaM4fRU0O4+ZB7F64MzMoVDyLDY+4y01OgHzLiVxpneTyLSD0j2dgBsqVNymBG14h+qfyiegh/x
LSxLELS0sSxC0tPWJYhaew6RGqAQyCAR9RvK06tIpYKSxKMR9jk8CpZXPVrCBJGBMjoeNPHuOIwQ
uIl3Urwj5+AlyQja5OLTNvbmDSHa6G5IaletmdodQntfzFEGqdsHne1prEFNXRtEuL9Kd877LjDq
bZkU7n2h+xn6XQ9rU8GqpuZYp2e109N7YHHzUYvDaD1umSaUQ6dwlfI7mnbGXkdYBY8BFC7Q+0G9
2InKwBJJYKPiWpJA45QIdyZfjxR46+fleIRslMnImYzkh72M8T09fflet8CRYRikBnleU1eO/M5U
ce/ne5VNVRI1mvYOBUp/fXXkRcEUzHNQiiTMr6jUSy7dACkV1VrQY/Da+f8lDsDtfNGZVq2p1ddQ
XBw6fbe7nknPKOJgpRAEwvfB9jajbuS6zmY5wGPry90KM9zg+ZI/UeScw9lghkFDtgEXMrlUtQCB
JJChD8E/G8Ov7tAX5d7tfIopYmkdwhOJbJpGuSaUEe4ayU77CwtE9w/a6jqnm6fO0fSEQzwQIwvs
du9OZmx36XVbi2tCTVDUJCOEy8SfMrWf1uy9rzmHzc3TITcGu7UpsCy495ymV+hO0dE5U26XW6S2
21k/ndm8yZS1cMguz5nlbwJIGqRHZ0CYFMgM1hRSFJoyACRdojYe66VWLVEni0Vq23b21qDUzRht
p9WAbXnTtzBwbr2LcoMEiTpKJC8yc8JUnKpkGlOe872Ali0u0NGjlYT5NlWwyNift4PzdOrgCfH7
xOjk0FCAI9uC6iEXAIRnWqOMA9WZK0OzL9JHuQDgj1/hRv+hV/YPGgTLXljCj1/I6U0QpwQDzfJs
3PrAkAxCHS2KfrUS80dwSwurC23qJFKYcH1859Tsc1Gd96p3O0JPXyeijjU3noTveCDuet3hre5q
am1OMugc01YWBAbOpIK+9LQCookgzqMhaDoYBiAWjEaa8PloT76QxAHrPl+Xsg5qUE++Ew+6Smmo
TFNWRK/V6WInjwsu85ONBLwKedODEAMWoPpg0JD4wxsDtayEIgpAqU10eYBwfjJlDMCRJsd78yYT
sSJzISHnKJNv+rsL+SuezQvcB6344HPuStewTpTVEshNUFehzfCWo7I5QEKQn0cfVvuDlC2iXa8s
NxskB9Wgnfd73AOMDg7g+gTtnLVVVVVVVVVVVSVgOsGmD43iJ3vKlIzKPp5k9LUghkiOuREhCCAE
ulYOuAQs6ivF4jpv3saJpVxoekmf4CIVaJhB6EVqzLKwUSiJHsiFMASwAkQk7R0eNAUsha3Xp5Aa
xD1fTLukDqOQ3DsHIFKEgSfJDxBqhDTHHJgFey/RUCm4DeUNYtuhJQxEQMK9+kml6SyGKOpkSDjC
AB+ChBSwOKSIG+QKD3AGlUYR0AZESWXhaVLUsYXZ1ZlngiB1Ih3U9kPyX7u91vwd3PmM9ATfAB++
iXGYnJtEcD7mdqbnzgGK/fBsTZeHScgHgZ9KSAftxAbwC9dnynDtOSoXdFwqwltwTq7H8T0m9frx
fNM30R705fPz8B7JfF4H3NW7CO8yH3k/i/N4vvbyXbbI+6DTy0OPFwZF+E+Di2OXmSOtm6EhKLKo
bkXtkYNjmHoa1SjqPS6C2mQF8BmhY96byh6NL4pYKG9rBJc7W6BxHI48nzbFLfsQdep7nU9adTve
An/xdyRThQkBb0ycEA==


