# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20110202135108-k5qqvri13bw85dsv
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# testament_sha1: af3398260db13cc846559e889984aed6a7ce1472
# timestamp: 2011-02-02 15:51:16 +0200
# base_revision_id: marko.makela@oracle.com-20110202121249-\
#   lfh1mihf8725vvx7
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQfQNwEACB7/lHAwCAJ7f///
f/f//r////4EAAgAYA+d89utu5u3no9972r0gNFAos9A9b20O9m9zqXZqvQddsbbWXsz02EkiETZ
AaZJN6ARNplNNDymgbSeiGmjQD1D1ABhJEBNGgRqaZCU9R6ZQYnqNqMagPUANAAAAGkDKU9NI9E9
BNGgPUaYmIAGgMmgyADQyNNBIiCamqejKepP1TeqekeU20oepspo00MhtQAAAAPUARSECMQEwSYF
MynkZKfqm1H6oNNo1NDE8p6mjTQzSASJBGlPTJSfhNTaamCTCD1AA2oAGgGgNAAk3DWTBjSSskd7
VApYNjTRrIj9HAx/aQBCbYwpsBn3ymIZVqIaIPn8f0fv+nl+7DCywTbllDGVwijbY0mm0xrRofL0
5H2nFT+ihXvXpFWEiorE+IoFmh0gGDvaNhZSnCEKNQMIoOC2POJhqAzfQyJPvidXezff6Th7/r8J
g7kcMkHcmZUR2ppSyNmu+fNvyT3rV62d+tOmCzcZmp37kJtjSrAqBYI699zD383XFNOzLgeHe+l7
93BDNhMAs2hc7QaWBtpm06poaMMOShOW1b7WueYFm1oMJkPB9kUmhFG2fwlUICkU083+1cv0XDkM
qirm5TVqQN0YwuvjBgiIB5zQQ9MOaWsBxo5EbENttttIGwJ7jwgHdpzaI1c9KuZ0se+DfUIMb4m7
bHGMoRy3l3oOIC1spl00OlfHXJk51kxoxjPOtizL3dsZVybGWxEUym5Zn+s7KsSudxUMaboXsWjb
06ewyx1DekdJw5iq8gZROzNX3ksgnSh9WkYAMFKkoEjJ4TUdAyEZTU3lxh0aS8EjyEsigCqCsDz1
OMuEg4oz2Q2y25rSgqQQraF/LKdS7YtqWS+lKqgXgW2TyYIbN/ctResmMyPfrpzwl3f8/JKV9POX
AY9algNZ+rK/4D8QEYdaUs/BCWd5KvbwLQmOX7TkXW3l2gNiOTK2vMOYamXmFgOzH8WS1EQZV5M0
SCAbYsM7eLQ11UDSmhcwMefLn3GBY5xHVzYd6bCgR0ioMMwSeQjLW1yD4G+3BsGNIPRyAyykqkWg
sqQdxcEA+fYkbY87YKW6oVjpJ2/Ky9COMFFvnImA4E5Gc0ZdFSnMx3GZzh5vlzPyouxaZJ90Erh0
Qh8rKBTzuUwJA4BIqHuw34nWGFb+Hu2s63i/H0da0QTBkWTixxQqlRptkvIWCxaxcbuHc511U5tE
iU1Kh6I7WMsOubj0KUcpxfVq477l5OiZWWSwN0k7aXmdOr1pBADBrH+ML/KGIEnRoS8TNhkcy6TS
ZKWerOo9I569vKpgYMGBywPAlWMyUMBQesck4c3zXK94pWry+hW7901dHdhASz/sVXw5e74u/Lku
bHNtWO/pvCbxt59sKdB3dnqkj2UfS3CmbmRe1eMD1Ml6PSPh6siUsTVkxSRq+jb22CdkIUIUac9U
+6zkr3wKWHkVh9UKE1DfIrT3OThNkl5ENTBxKrMkyuQJmg5j2Fh62rjmVM0lp7FqyzANM/Q8DV2j
BPe8Y1+/7Zz07OhFaCXx+w971aWSR7YygAUxRhJ1PGfHwHPrXsntTjFAX0EszwS035Oivx1pg0WM
TuO/5kk5ItaBDTvhG7h18nWMTVDJLxNCO/P31VRv4aVZnbuexLErOHkJFEglBnQyknEnmU41ty8c
jCXYn2MtC75kmgsghcipbZGNHi/hzJlpGOCSg+1ziIG/0GTMzJtv6kC9c0lDWedqJZUcPWjIpdqJ
TNc4OckRdF4+xSsZkZRiZ90JlSa5NQSYRkQIR4SUojWYCIx3Gb1sySvQsJV+DBYH1rlLVxNnlfKP
tm8iaOjGbQym8Bp2ivNJEiCoSIDTMZDETqOQW52JZFTWWieDcUHrLSwLzG16sVNW3w3GhLQcEkzg
mWIX00yd7tnyq7XPJ51yOzOJVwc5OPmM5icx4ejN8hreaJ7ozS2rTSXTRJPcDkQmOeXKqS1Eu80m
chzj1CXMK65TtRdtIQJG4xuS6kNtSmg5OWfIysaFs9pnRJa2qZ4nOJDjdLwwIpLMiY843aGcAv9W
WkP9wly97GBGiskniZEslM9MSCvvukuInHZw82RkXM+3SSWpvZzM9gdYY3UtbzuPs0MUlMSrVZpL
AtdfapG8eFJlw48AljIv3KoyxZki85a8TCxu/LIkVGJmxaOoxCUGiZzJ9kk6jV5s/iZELEqpKYZL
Sx0kYylDBjMfIbGhccg3xelj4Q9QyRW1OotWWeOOTTn3gbxFV0mq0xYAVwayS0LePNgZNI36+Ikd
gHGemJ+6meOcSah7cTTwElKCGDBJybGuH4nk60p49O1Xl8IRNCNf3fMHvmH3Lma0gIiJjH5lZeHu
kHwYfWIFqv2ju19+jXS1SCApWEQ0l+0N64xAWfb+EbEbQbIELWsuCNWZkJpzJxo0gHMgGkIvV21R
l+xXel6sX56lA1JaV1hglgZIVy+Iph/u43Rb+LdaoF1HFGu8UomBCVC60CGqlVS0sJVVFvtRmGKO
xWyZqiy8KxA00UD8DZlUCGbgjE0+V+Tko2vr0dX4q8SwEMQECxmRrThzTZpoV21ym1JWme2rmx9I
OcxoJ7PafWGvxE/PO5IgF4NAqpKmGMYyrBfAQ0VLMK/VhFHkBQLAu9IN6kDYo3UpWJANgZYC54OK
HLTBeQ8KSiNMJoITURmqG2JHOf6YtWyEJ2DG7hJHdzV+GZtNx6UowD+ixkLESPmzO9J53IuyDsyC
SGLaglBSHfx/lVTSfTLhnUlCPbnFNRSgRwMmtInSlZ9iSJVfPijL3wFGkrr87zq5nvtHpGMZtMZK
3oGqEwGDQJD7CObey5T6M3nTRBHNWfPCSIiGHtdJd5RakPfQ+xqsBCaTHf5hmg71YJ7CN4b1Zn1q
+srET3Adyu07uRX0YUD/sJ0ktlJnU6a+KZfOcKlB2nWwm/duVOSlEgTNgBjLDJW4Xn88reNnPEEQ
hWGAQwkGyUA9rJG+1WVLkSikFYlhRZ9XJhU7ZwIOu3AvXeadB6TFasC1TTpRchoA3+ZWrQT5R5jf
+V77yahbirqV2FJoYDIqz51CLBcCncdHDZMlbiA7E8oP1iQ8FSrQaUPe5JhEDFEHHO+rkRUxFVWW
LWBJjr5HRtzqR7en50H4qZzPOjkjOmbQ41iNKIC8B2J6nTtneNYTDaxjQhviGIShWRxoUX2JIoKm
1wk3KOc2E1x57dr3BUGZhScA9JMQpwpfqNHFbHD2yO8U5URveglt3qu4HxucjR4r0F2kWaaVi8Zi
OGjHhC8ybJVmJC6bSpOjbkr4Zc+Ba/TarKjSJFCEW1X9eZXIpp+NA7Jd8Cai/EHYvUSXyySTy0Ux
SXV1OajuneK85BMgxV5RYNBYsAVME8CYqlt+4uKQBdtajY10R2lMAdKUwnIEC5WP3p3DRMBCDosJ
zO+LM4AzkM3ozee5iAkPNKQhxqSixWrpy064NPkYIxedJHSDZmowwB2NsTYNgu1Uj5Gs0zSrQjrt
KWOxCUzcSIEtq1ixj9XRSm4lKK5cfhvU4S2IjQquuYAn5x0JqQutAu+rwDyKx/n+2D7BpYjG22xs
HmHiPOBRpD47hleIb+Iemjn6Rls8797PcPxgEkxk7NZ6xCGz8QqgOAvGFYznwTwTOUaLNaWph4Ck
kxsF9W4U+GrnAzKmPjwLM5EJEa3wisCcgosCnWBzGPlIKHfAoZIR9Ca41KkCeSegYqctzfoKZRmX
PtZ81JQp+zpwj4dbrzWeTCmkdSwS2QJSsiKoWAHL3inMv2n6hhJdexubht/udtm6qPFr6saG5dLZ
aNVicht2/OEFEhgMpnlEs7hA8RmqxLrWWFGQ6NVoBa7LWiAsgJhFUZCBlFA7KpgxWmI3VjJkslSi
ECFXYl7kBQYczSuEDph4MOD1sIXx6UXXriYQho4GxQKADQiCV9FISZm1ZV5tXSM9WAIGgskkxSvm
EoUMy3xCvFIJOcJMMJDPYPUAYHbxrdCpEGe4gH0XyojLzFZpLHw1OM3/KpNC4AgUriHGTkAxxwj4
jBHK9Rq3hZOnI8xD6GhpMO4gLhY10YVBqkAGd3vcnlnTijllyTu6hK4lt42PWJjUEGbUgxSkaRMU
LKAZwDQAKlLZ8XoqAKoE0c+KdfQUOUlBA9AqE0IZN0pBBBBMTU2izFeLMYsVVIZZUY3tpZn4skx4
vkFvvvk+bBBwdZSGBWIEWOQvpO6B6bHi4hgxYySXVC2ydJmRae6/NORTxZ3kLxS7RRTOUOBMhKrQ
rjSYRzUqyBgaqvi8bL9u+qsJ2muFWp8sM0xqxkQs0+rBc+kjM+vBK4yGUPGC4yuBkIcE9hKoSa5z
rHW2J5wQmUGVLVJU0mZWgqwfhyLsFdIoho6BHYkWCwqqtpDWzVZwPPXjDAixhJKa0yCa5pIeaFHT
kZLGXPKWS/SXG0LVCGpV91HsTqYAgFg3WOmouV0OuBW+i4mNBuEosER01yWYJrEVG0kyDCYbCSiy
I8SdkjI3rcoS3Dm4A9Gcm3A6ddwG5hOXnw4Mgk3VbWZwQ7Be162dgO7EXZa0GKhYr0wT5/JIRNeG
Q4uXCooWH2ZQQFLO54dtbldorcIeUn5nsaZRPWkvaJQqFAx/yz1dYu5IpwoSAPoG4CA=


