# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20110119112245-e0zpbgirk1c4t6d3
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/
# testament_sha1: 36ac7a37ad3897bdbeedb8f30364a502e649cac2
# timestamp: 2011-01-19 13:23:21 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@oracle.com-20110119104456-\
#   ngjuyqs8fs3610ch
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeYeH8QAAeJflAAwUnf//38j
32C////6BAAIAFAE7F3vaDve13uOdPWkXhJIp6aKn+pTyeg0p5PJqn6p6ho/VGjT1NPKaYhtR6Q0
BJImgMVP0ENTTSMgaAANAAAAGpkxTU2gkeoek00epo0AAADRoZpDQEkqZMp5kp4pp6jan6p6g0AA
BiAAAASSTTTTRGqbNDTVPA1TNT0hoGQBoA0HqGQmQwMhmTFWjg9/S3Df8TJM0/8jo8MGdtd0zd0T
52uhgD72GkAMZoHmcx5JMdwteNhEQ+PYX0gQoJKkeP29Vq7AFO3PlyaKtCyhRfaZRGo4vzNDDvmI
Pbo+opOL7HPNLBkxReIBgUImglz9MVjTa99nvcQUMz4ECnGpiwivZfZdBzBUoGim/we7Zz8jR1ew
mKs60iO9UqdEltF5NN6MV1c1+TDmE6kBQSMRxkMEz5YkPG3Wc/mSIxGomiYWRMekGXXTfMEG1dat
WMWNHRAR45A9YYFffDqmIsEwiqDlC4VL6t1sii6Tv4dWJs6Vr4dO7kImMUMs6qwUVltoh0YnQvUC
gOI3FU7DKWlg0ttsaLSPAaJc9Nt2F+FfQEnbVwwfS5XkZEYsX5V0qOGeEwmKYO3jx1hIbcoisFHl
ylkcAzsCw6CSquxRtiUcsqYYS33BWje1ryFtpS9+Cm1OJVLsirc/hbJUGZZxL7FcTLIlk2tjWtFt
yTam6NkmnVvCFNlFjUTuEQwIkFBsrsZEy8n6vu3s5vDHbvM2v1ccXE1eKNHkHJotAoCM7ULxSGt6
TSV5jNi5nvu2e21FKsSOJ38OLhLdIERYF5u57s7SWllMwOSFDhKymdssl5c2WS2RUp0iqCqUEdyL
J4BGAVxdS0zFCJHGtxK0PVsVutzga3a86OqBEa73OHQ5CDMvXEPOr7i8kkdEv7NzkN+RIsDmPPAm
eGSdulI7OzPyjdRdJs7gdmsRDhiSIqsJvvbSAYDxsPRao7jXXYZv40+WQu33ZHT4AYmpm+IrDGrq
itOeESpU/6QwwumcmaWiO8kVpHFnyyK+EjhzE9thjqxZRUap1nmTqiColu09m1aqa1AkZbTDQP3Z
QxZ2X1nrrt80wzPdFIc2QWDu5TfZgGsu5pcs+FnYZBgMcmyzD3kYGMbXd1Gydte49Fk3jzNHi4rB
YshSXpl6MneLrprB8NmjjhXhqIxCmSfgYlnI18LTOuhbFAf++McZlcYTO4hNYVIeT8N4nBu13Z3F
4M5IZVMOPCeKD6JjLeYU7eaat283J6z0Zc4RcW/N2ucJ3IozK7QUdjYBtzjfyPTENJoTYhaC1C7r
gpnBUnK8HhM4JmSOfbvrSGKlofaVynpxgvEkaQ+R1DO1ZAjJQamKwgRBNxsFcpG4g6idAgFIVAqO
WxwZz692EqAiUsqBkym37dO7BNCedIryFZoN2MfekVsSEdx1S5mj9EiYQHh1AepqefPd18Z8lnIz
KgvxUX6zC8KJrT8BC9nhUzkBxyhMUvHD59VCHS8DiF8/MJgVIVGiezMZqSJEZziKEMqdb3RaaQc4
UHGGk8b4hiurjXIHOvUnGwuILmNIF4PGqjFcM+nF3nFDjxhqWFjh8tAK7VYwV1Z1nLY4mwF+Trn3
PoVcQzD4YBJUqTixcy7iqg3fVR0baoSLlTUymclpYrAhTyCeSyhlk9RxYqhBaEQ2ye5i4NxXEotE
+n+MHV/i7kinChIcw8P4gA==


