# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20110321075638-u4i8z7g8he5g4qcg
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# testament_sha1: 2f4e144981bb7c618d7bd6af7be9e8d94a09acec
# timestamp: 2011-03-21 09:57:03 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@oracle.com-20110321072758-\
#   s31dty03jh6yremg
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQq5U2YACEfflAAwe3///3en
n4q////wBAAIAGAMffJ5C+4+zXsbslFApTdcUV0DTWlQSQotmOMmTRiGJpgIGBNMEYJiaaaADCCU
EJkwkyaJkk8p6gaAaAyGIAAaAanqMmkp6gYI9T0JoYhoADTTQ00ANBoM0oQIo8ptR5IaB6QAAAGj
0gNAARSI0I0aTCnin6TRJ6ZqaMU9QGgyDT1BoAFSRARMmgaBGTJJtMiNNqNqeiADQ2oyMuRpCEuN
iXr5LNWrBDBwdycajelaOoA7JV8lM8ls4hUsiixUSwpKSoWWLSyRxTSpHpst6LrJ3YRZKKVBaibF
XodIr0dvA8A7kgCQAMGDHB56pRP6bucG5SY7dC14CQtvLVELRnkkXsN7mqyurjpbaUG4OrhSSdIp
Ojwa5vBZ0BnkoksXvgYsINKLRWZmmkxmIRY0kGGi5y/GsRkD3i1DsHigVAXh6BECNs2ScaVyouBc
Kdk9SY2CYIEmgSBsEvr8kk1qy0679a3pU1RSoG/N+UBlpUgDsLEMpakxIK4utMlSK9WxpjdC+F8w
LF5UULjGZZLDfwL7ipYtbvY5WWaR5hLHDJStVSspnjgoZnFQr4zzMIEkkIf7UDuMfp5nXi6sBBKB
uh1DSpsU0DjIiCIkJ19EiZI5TEw9i2UH9tGW4qD5lTSN/qTVn+SbjqTBYVimYXOhhse95sUdT9NK
1k15bErTp3l+uSPnevz8/O/zfV4KVSqpyJ5dqX9eeuOztSM6D6JLUNTwQoe99cnmv+W+3Lnu7eKD
w5kXl9BVKwBigk1YcmjsxPwovGCHUgMW7yoJITSG0sKDUk7lggV8UWC9VmVjRLZEgqeQh8UH+BDe
CVphgIY7M2M9m/KPZQWc9PRfPBz89Enkq11rWtZZSvMSk2ouwfoWA+UkRC8RmOnDIPh3GEqAxCO0
fhElUbgmuEVjroSshsK3y6ivV4tkdMIkc6F9LsWLDW+GOCqrvWiPUzboz46cmwjSUq+fJ18lMYxU
FcjCzYpWFCpizyeDFZdjdjb6EOzs6EpPFK6YHNUnNo5bjhW3C9Whjmqm0pyo+qNRQUyFpNE6ec2/
HxwpdhGBhPMqRP5LpLi0ony3xQQKodSYa9SMTRq+tK8zLdsI8zLgPvc2K0ZxLqPlw0X9NGrZY0qf
ehks7dvg+GCeinbTOsejsaOdKQ63LxpsXWXdMXYu2Fiwu1yRSkZdGjk+dWiytllAj66AjpXdibnH
pAoggqTIWMQZRi4wpIg5NUaBdx7sMittnGlnLo7VOTJCzZ07YYx7qqqqqqlV96SbupXgmDMzJEAt
UdHtPKQqquz5QoNwVshVke8hHd0EOwyYkVJUidxrwEDTRdJgDcRb4bOrYLDghIdCcaYV2hh6QVYq
0oGbbkENlSw5ItBCuK0d6qYWy4rHDn22a4Rbu3ruhScynRJzs3QdRAxA9QB4wCl1tFacFU3VoK1N
PFxlwInXgQ1GIl1KrPLvNBzrjOZwLTRLPVSIBwkVEB0TT/CBz1GQKGR0NjPB0rYQIE6SAPZ1hKOm
JnHF8qOKLkuUxUabBoZjJeDxkAe1UmYGle4+6tr2zEDmRnI0YcoXxz5gUMhA20K5/ChtdE3jFbwM
6lTnLQoWJEeVfYsiVEC1iL6wSFSRY7ojhzRZmhWuLS7VhWq6/PvGacGrV+YbiiZxZVaWwpfekERD
ABSdIKvZM7xAmTU1zyU15dhSZBbsreDwFgKUI45yHsbmytyc0MFTvA7XYG7Wqrq4U1w2XvXB0IcH
JgzllY561XBZHN1nmogZFOU6IzxKkDkWYzFTkcTiaFzLQzKGh0IkTx+RNPgREFrUJqUUopnrxXKQ
Ha6JJgIsitbkLLYzCFRecsDtjgYx4NZ00/KCv9KLunbz27azq62NECsN7m2vQ30/GmJ58NgskmKA
hBwGcw9t0Ry8B6k9EcBD2HpAfg/APIOY1BnhhKpXEXr6fwPyFzD8ZqNPxMJkb0k+Q1G30S8/3NDd
rgTAtOUxP6HyMI0lbDM+wWnKYD5DMtv/4P+nkj1HzdSqUVR860KiRN9ZEDCQRxkVJWkRTtkhP1+U
5jOGgdmFs2E1Ixsxk2fC6XeUWTKMyzXUwJkLJgUwWteatEn2Pah72P2snwE27FV8c32v3Ptdu1w1
RON+Xm5VmUSdNEzhSHhoJm+mPcH02bR1SzmdI3XXq994DK0peVG1ggIjPaI6HY2rvg+z6eLFTXtZ
OtsZOjoYHa8GaG/RszFPrPIek7U4fGbKLH1IdD6hQ+ZQVRBp2cdRnzWzESUl71Ur6LyH3Unahfm5
rupTqx7KrpdjtcUNWC6Gbp47oHJwefahm1QpppyaqefD8w9T17u/PjrUwuiYyTrRNvcidxSNUtql
l5Tc00unmlRSKUjNGU/CKVFRg9Sa9DS1r39lP4PHs9LxeeLvdra47B6mTaN7DxWZRN7kODmwjx7v
FvZvih75wczn75Jt00duKo46h1CEpBivOakphrxzXpq95wLx7vVcNYVHbLohSpK81fUUzpeVGaJU
pKT2V7G51XfU2WyV3t4aPN3Mrt+ak3p5ZSctsUcqVC6hAYfwKiXOAvNEALEGE27+45E+b+GFtYh8
7ImmW/Wun3WfyE/srgnGo+PkxOtGEnTKFjx5e6+yp6lJSppv2xN1AlAJKV5BgbkcxZcGgoQ8Vut9
D2sfnYO9ClaNHjJaT1xKPknuT2JuHNZ9Xp1iWv1t+VpLUnkHMG+JOgoQirWCY9qE380sJecXfyAM
O4yNK+JsQGRs4Bn6anVypuYdX07ontjG/YcnieapMjJ3ZIZFZUXgvir1oSGgGnffjnzCnSHh0+e7
Oho0DehMTjCmTZLvThtEIHm5gH+tKFqD36ms9JxC9DNIFralyiMA9BYhiKRrl19gZUDPlL8qsr0G
B1Slj0AO9fxPnWBlw2F5F2lfkpsL0zcLKiqyizX7bihNUgfrCMg6BtrV80jYvJKKGbPx3yYPRoha
rnpywVJIojRFKxkpLFSqFTDy89YoT24HbFcOHIVXA6g6AwaqzER4Rgh3RJVOLl0EUUlAp5CMkKx0
t82mhHNAUXFqnmc7VusPNINK9jQsTyS71Uq7DyPPNFVI8aSh+eqZEbpMUbqWUc+/f4bMOd7QzNSZ
+JqvKVBa0T9nFPrwf5VkwRkiiPTFiWXkHd6eq6bfd073YlnZ6hdKdiWmLFNbXUVSMWFk73fSudMq
u21N2S1deT+7UHQ6zXXl3xajWAFjKywRa0sv4WT2eV/XWXhGOU7qorPv2eTZ0XzFjWpwTqZb12sN
6LSPm3Df08TGpQtkjhSRyzakisWxF9yKDCinNuz0SYopEtSVhMtRCGUJBXRlsGRUMLNhJgwSCKmx
UNEiw4hIMWBNlI0rY5UkhcydAzTuBAsW0Q3jabcBy4OaOLpD4l/rc8k3T7q4pHY3If25ZOno4yQ6
1A+5ixOziu4z3beKMJIH0QiV6K29fanYVOwA4Yg3f8bvd/4u5IpwoSAVcqbM


