# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20110301163928-9t3p4h6iovs7cxfg
# target_branch: file:///Users/malff/BZR_TREE/mysql-5.5-bug11766528/
# testament_sha1: b9c0aec2c9a265487b9f9236130aead3de5128c3
# timestamp: 2011-03-01 17:39:33 +0100
# base_revision_id: tor.didriksen@oracle.com-20110224070012-\
#   qmhcbs7oyzdgiyyy
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQDyQqkACpn/gGBwUiB/f///
f+//6v////pgFdz7O0nbqmuu5e83t5YOSW2lQornbYFUKSNG7AK3Y6UAULs7Pc0CiqTso3rSMJRN
JomARkwpmhBqmTPVNNpqeptQaGg0DQaaAGgShMgQJoamJpNNU8U8k9QBo/VPRGgGh6ag9IAHqA0p
+opqephqYBMEaYjCYQ0ZGExBgQGEGjASakRMo00TU8jaj1MRNoJtTTTRoGh6gANDQDRoaHBkGjQB
k0xDTQZBiGEDQGjExGgAACpJAmgCZMkxGTUwjEJo0BlDNRkPU8iMgGT0mcDiIa+YD/CjeP8+3GvL
UCick5ZY84pjThRMSpbsy8EvL5yx2zI5pibUMplolS4aJhHHt5To8UT8ZKGzavfdvYExJ/deXuBw
Nqyz7vvn4h2M85DwepnF57CHjNZb2aCdTxEyrydEMqPZVVZ7/1t/b1bT99Zft3HIWlA6765D2RIy
Moj949L+0P5SMc8g3gHODS86ZYI8cwt0bwSUekv/5St+Ovy8lXzhQyWoeeUt6OLVarPb6cWrn+q+
6/NJlLc6djFS9W/J5Ge2tgAwUQ83vkZKmKZhr68vIjaxBwmRrkstaylOJzKQRDvKHS2FZclBm4Y6
AM0jwJNNJtFNvRParh1WZ22LPda67Vxt1ecNPwkDWknOgXg2sD+aK+Ip5Hbfu3XXImk1Ydy38qOy
TzxwilFFiyKQ0+jnoPPANOOqxrS3HxK2mfW5Neg7e9iSheG8FxW9GqphJipKUrLRXWtuvpk5EUwd
l0LSrLGoznEszPJCT++bGlVU3Hi9bsNv1+PLX1dTgminOKg/0poEfPpmlMaq31GPDHl5YVRV4+wP
9p48IwKYfT78s+wFM9PFqwO4poO6GCnh96uW32+UshI61oTPTH2O9ArTOiQAKnwtc/h/rQT0WSPc
LpIBFE3gGvAX5IREcAmMi40kjfCIPKncIJ+Fa77cKUJGi2nRZuJlqqtRagq03OfBrfceHPcuG31m
CqaBq2iAFhGDqDSLrQX4PXBWNC6+KJWu2FFt8eITwPC4AMsmibwaC2NRr0X4jz4Saq47+7Sz6Vhj
P2KlKhgLgIik9t6Ww3bUc7BWk+7JHlRlF3A+W3rzB5vhbsAicAPqiWlzxPSnfD3/L2+Vs3/NV5+y
Jdv3gBZ5DEa980s0+ThkeTw1p/16YAd/quXeJL9C2otJFBZD6yXkC6Bch4JYFBDkCoIxO6AD0Q9r
p9S0I9OCsawgrddXc/GiK2VzN/T5CM9HWEwghQMABbSYUeKiLJJJWuoGFOHBImqEEBtl+zAbLQRe
cuuv63QXPmlKtIfY8GvoXTyWY53PyCxSHi/Fyiq70NhoXlLLMPU2bmxy1+09RopuZPATiaAIiegY
TFBaCVZDWaqd8+jBW8rnmMUBDDsyuiBzt6skYYwRBNU+MAHhFHTFnxdRKcPu1R6aOyS08k9MTzpJ
3DQiamSJnpuhgM7bGUlhhagscEGMZYJMgDgIdwk4IzwDA13K7DyojDpSGCaGbECY2ea2Vqoh2M8b
EP2I1GSilZ+RV2rO8yKXlSYFJFrlXCAyMVVyhNJzi6gRAwIjkC98NIfCQuliZQhIR4LzlHU+uXBa
oF0n5S4ZnnLk+OA24F9pdFEb0OImYqKbMYLqTnff2I8/TEsw3Kgy/teSIiSDsG6j+byPkU4KAHR2
4HPDRyEw1ag8KIHj300uVp2VSQuwxcdN8OvVu1aPtZHunBjCx/LqgOxBRVFulIzx1x27Si/RfAQL
iKbY55DN5sL9cpx0StDWE0y5hrRFcSjFRqQwSo0j84gJruYCtNw/TSKdI1wivPjvnTddcICyMIOo
IjExZxJG6L2/LXKZkliiZ1pbF/IUCySJpBz+Imj1C4N3bhsha694xqUp1UiAyJiM+hVTJsiWvZCJ
hDiT0HEn1sSV7sSBx4MhcBqtqdLpMnq5XOgzq8cN5IxJolGEQVwMFQUgdITukdo+Kc+nTdckXctE
iq5MWBVHi069fBtQ5tbqbIzdHBvc2gxrQwub2UdTkhwEDuNQhXTVrauxzOc1LpVJEotJEcgaHF4z
0VTUYcsMMrYG3TmYlCiWsU9R/2KClOzHMzIGJSIYXABZCEHGZISEVqnah/3EQOk3azzFg8qpqFsi
TDKqNYNhucdKtskRreZeFLPNGFAygulL62M0NaG+D1PajonfFsjJM95xwoGRvTGCxB1JmVocM44V
DPF5zbWTmoiLSUasmNBOZHUR1nHUE9kzpx2+WD4F1FHiqSNCxzJYy3sdmK1CBAe1zgZD+s25YV1N
jkZ8iAyoLmc/O97bkCgdDFhTU0PMaiBU0RIOGGt9Y1wdOW6sLQmEJUIhhfiepvcqdUOfLmaaGhnx
a9dtbhQ1WkpCrRUku9Ql2DxLUsKWwQJiMiIg5CBaUmF3URmJOSJxNhca0xoqei8eUttpzd+SiA0O
ORDO/IryguL3FGOg3QuDVpoKSrIzh6k6Ys08zPLLfcmQUKGJoQP03GJKyhXBsno6qoSk+xKMyCk9
2ZcQJGB7MdBSQQDQQxxtpCyhoSmks1FZab+YcVwOAgZbZ7YInaiBTgiEOcOGvOnYNW5Z3AraSArL
AECFJ2Zkyk1B9gmbydZ8TTaBXgsVVyyPPMcYT77YFpcyO57HRhyeMB+AD5Tc1O7q7uepiqIJpkwo
RVqkZh6jUV+mTRuvP1vf44W3a57pD93/jOvtf3HX8wCSAD8ofrQQrQr9FWp/mvtt9AAVDxvRBCx2
8YsSMVuBPuv6YBVUBN7G3NgGk3ukW9EIYNkJm/9/205CadaP6pFwL96MG6I6yfzKJbjhv4Ccbloi
5e/BJjkc31iXGq8TXxHOLtYzNrBifJtNAuWdBLRRJUpMqi0z0WLWU7RssX25UoqSbfMDkahO3Pfw
5IdXTckfx7Yj8EbrO6HfJ1R/TlaLlElvNtoqpt0kl55tNq4t+0TkkYbS/Xd/RB/MO6Qqgqd5jbOB
OlnlCDtTYbLSyGqmEyhP1TIS/APNEXCVJDscO2eHbfCeOO/dZlmFdPz0jSeZpJxM6pIFG9m7xDg2
+DSBM6IsngJoePPTNKRiSafw2dMtetq/I6IXeCQ1W4QlhMrUbDo0+N+8G3ES80iY7MsOOstdlakS
qiWjkpaaqE0wmiE24W+Lck2xdqMFCaWGGutPFncKSHaJYls4ZSTxZEh5jrSTrgTWQ9PAGGuKM3Z1
IiiMpTRayqqb4nAbhNYli4nWTQNBL17Rno1ZmBMyfD9r3fvqxsKKItIW3H4rwGKWIhK93C0BiBwe
HLJGCD2MpFiIiLBBQVRFMvcyAKlGINUV4yTyy5GdFY2hh9zXsNOuQYlCopKUpSioUKlY0u1vMwL4
PzaJncC9J/B/otDO+RMhdr7JVKlwvMj6uLJ4pxe+WsVKgB7D85oAfOYfoIwNTYr7iCWRZj3HvdE7
eHtoZnMdfWSftX/n3ran+bo16EXunT0oTcwOfMfwkPTNV9rYTkRNdJI14yg1yQwx/XXzKnPPcx0V
UPu92mQ4M2VukHVaaNzIGVRGS+W7nXGQNO/ffxIdXFerMxJBGSakkD2dmk++uE+4YnPNm8nNziMU
gSIfdmPGHGAER0DzgdBij733bODa+88vvR+ikpk+ySj+8fJevS9Vv69XU9cNRWTW7MJ/E2YPJoYX
INQPUPjST15TGb6S10h7nc97vebuYLnFc7169TwegyeDe6Nu/jLel8zW4PZOXhD5bm3k2hzSpLCg
eb07Tm7lsIK4T4SQxXU0WokwGyRPR50npFI9H26h9kq5/rrSG+q8EObYbqYFPdZdcWuq0nGLLXJa
yMMe5ptx8WPJ3TwxbLsWMjvZw23alRlJKTT2qn3vhIXtyt+Xu4jS93sMPACSfAcCCbzfyRxwR4Vg
Q75ISVvo5/TSl4Kh1EvusuvZU7qTopSdXhclylJ/EH0bXRknU0PKrjBwCkCXkQLXg2HKRDRhmAFi
nkcWVVFFoI9p0qk6oYzvFBa42RN2IBS6CIwZjJKKRKafF4rMvj+KPD3sWXhpZbuN3H4aGhtepe6g
deuS0nX1eQrWukKicUVJyoFVDoIqJLOmTTwqc3rW8HJmiVKSvJ7NV+e3ZW3wxhdhQHdjYLw5Ge2J
2ckob0Mic6+F92kLY5lMz83FAhMwdgj5e1p7qwnt/kfnm135N5rhmgfEjnaLULoZVE8LqmAKqkV1
WS7lHADnmT6gVADDTIhI9jfyHtFRzqnRY8EX43ohaRpks4ruB1afincFpJFfMNKNEI2CpFRgqSYz
xgNs3Hwo6by66VPd7R2LU9fnZRZ72b2XrP7HvWkKXe1ZsLx86u3BgtIYQwyQ8Y3/Bh+aTo5yfSid
66SkKFUFJO8Tdc7Xu4uuOp6JijreiSFn0eCyblVQl/PlMssuN6Tcomkq0lV6rRItJa0zoHc5sdUi
stbV2Pe1tXDbOY+Rpj0Hq4Ta2eEZPNxo7UtBp7G1DBfqCpVnF3PKXNT51onsKibdHp0yQ+gGBXfa
ZFXtasrqVwbvRIl0aZfZYZzYHOEqQMp5XCpoe7zh3oubLZszciJldWm4Ip6Hhh9Sj5y6HCtrIFTg
QPLrt3XammZVLnVEekXTtqV7kcUl6Ul9Cfnwtp5lnhizgb7wuiaPjxz+JE7e/hJKqqoeSGp3MNUp
SlVK67+XwRZ3sJ1OaIrLs+1zL2vLIW9Pa8tikpLERXnhXKYrqKRx0ZlBId4AKkNoiaQ2+xzKpbzW
P+qjAwKVFUwwwuVVS6iwnfN7qF+zuGuew5MTnO631hMjp5hxZetgmLIUnSRkSXoTNenTZJreiosu
kSoGX01ZEi9UAMZbvQY+3NECNUWyQcAA1lNIo1V9e9vAD5E6kRiu3Qqa2mxQoiIiLZRq1S1HRrFL
y4xDDpWojGJaqpjMW2W/q25CumAoMqb3gwECJCrDsWuU8qbFBSiSSWkRADGREApiECpNvzekHLKf
rPwMl19Gc0+rfIJzka+jB6po6PVu+ONbSDn5/yxmbdow2tCcBwjDI/rK6e2OLlnnK2rSR52ix6iN
FMYBVe6IFRsW2SJGqS5HiyElBYYpclClCvxrkXI+3qYVeRMzmxsl3+NF2Kzhg3Lo9bC0DH5FNs43
34xv7M40mIZ1DXWq+0qENsKklqIutOxxU+lo4fli/FE9bztsYX/S+b4x1Y8uPOPl+to1M5IT9FMp
q3WgfAk/fuJrUpTOiXg/HnhdMMvBRZz6sV/eZastbGp51F0+eQiQuAHCXXYkIe0YTor5t3YLums6
/a8uPb/Byh50v07nyu9C93Ya3xTGxXXnE+CF7mdPhUlQ6vbIaBbH5c31F00SDxt7Yov801jTVO7L
XdFjObLT4lXe11Nbvco0m9JJ751tsfXsevvk32aaiCoAJKaJ4ElRmYhpTYfjhCFxom7x6X6iOCZA
tLWXAusqq9HjObQ5ea0N4j3JN/xAePZC10Vg0GrcgHEGYGdn9LEfpnhdeNEI6q2svVh6p7foefGZ
ojyXRpNrxjXwnOBnrLvBy5M9Ktlq0xLRa5V1WBoCjjOvjj6m0SlVnaZnaU3nkx7zfDwkDsy12AX7
evYk4AA4dHU9UUWLsADuTjwywaHM9XCTW4IkZLfw7k5wITRNUOqlUPMFjxEJ4qqkTM2cT0Rsqqqq
rfffHbgiKSXpOQZxO4j5PDJyR1MtVSM8b1pGYMXJr4aQ7xk9nRE3djJjLJ3EzakKPOFr1nJRXSde
EyhDIkxBDiie/9iH2NXfqZiGuZ9ElyNTB0k0Ml8GiomKNG/GY3Z3EX4nopHbUacZbHdL5NzREsk3
+1ua454fBUJq9JYw7fpjbne48u9hI8yjNPS10l8JRDRPcophMxp2JjY2sAKgD2gvrl+WkxL0Pc2B
5Eu5y2o5gPWdmULvBC/VYLeiEyIKAFjWwNcnDD1r1DDshiR+0wk3bs54TVD2zoo4zXlv8ZJPHqve
ZjvqA+rxlkYt+dyO9mvpD5zkK5R4TmRxopGmgaaGkFFFB4gOKJW6JcRERERERERji3HiLUeus2CO
KobF6wbHqQ6mkvZb3E1/mwQ9jF7HN2ZemgXWyRZ2RY568bjcwTGfuvklhMAtJFhYL7orqlJDohz+
GrVkeKIlxqJU0pgnZxpeRJm5EuFaaB4CVi8sEuD/xdyRThQkADyQqkA=


