# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110315132451-phdr7rtq5gce4947 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: a5200559782a9a691a01b45cf12170333ffbc39c # timestamp: 2011-03-15 15:29:13 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110315102653-\ # 7h4s9i14h8aew54a # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfVnPTEAAmBflAAQUmP/91MC EAC/7//wBAAIAFAD2JNXtqXDpHA2pKn5T1TYTaCngVPCnmqYh6m1AbUwkkU8m0hop+lT9SeSMj1B 6jJo0NADEjQmmiM0SnlM1D1DQNABoGAAGgADJoAAA0AkkTUn6J6nqjwo2iekZNNqHqABppUkjHlA khePa4EhraEwSdIu2zX3nAwk28E2Q3dhV6s0uOVEkAD4/AgF5Zywt94SkwQUlaLCaik7MgHWbhhn wZ09WonQeM4UeDhohp0UsKSkY/2z0+/v9bv0xBk3Wq9dd1fXVJzJUkFvrcdkKJgYEDTPd7Zo3Xyg +ktSMAUZT7YaPXiwJmAZqswPIe5DKQQUAIBEBDu0KEpDWBiGDSRRuOJpOPrNiAbImqS1BxxHTwwc ogc/sOvpzBDQY41FGMOOm1pTFpAFgMHkmF4Gv3z0V9kFipv9Fdd/vt1GEAYb7eYXR4ZtPbPrGsmb SKjMCHQEMAHXFpgMJzBiqTMojrRw38G70PqYBjnk2ejJrrIsggxAXNtck4ixJMVMGeVzzQtkTmVB SPcGDWsLBipMOrNIGpEU+A3GiBcIZQOnI3kblpYRqee2oMT50Kx3K9P2u0PRO3Uro2MTgPqqfkTm cq0uQg9CO64PzOlBxoXK1EYWybFJwk46o5joIzPLapStYyFuK5Ce1Ns4xhHXJUVTQ2ZdeO1iHA4S WldeSoZ6wK0IkVXJOvTq7NRSFEnNutyBEMhh2qN5qtaLFB8bxT3IrATYqacUAnRWPyHD3XuMW8Ie rt78j2JEZ2GXZzxc6WpfQyV+b0yVykZArO/muILGqhxgW7tgrgXOut+ycX7igfx4cShO0w6SaDiC f83Lh/m2w/hoMp/pyQhlsJ6NTI6KSkJjvUV4dkW56PZgUgXlTZ8rdlctrExLxHPPaPqNIoW9aojH py7uBSabffmQFlDeYXd++ydA7RIK40knGOHRNtUr8ps3h9uPcFx8lkMa44c+HDRRStLIj9SYZEq/ BW8s1eXZQVFNS9+nXNl5p1KIiu4TVnqeGKWKJu1IkZWDW0Kr07jQxV5Y8u7Qlwj/X1wtDaHDa+nT Ym50jjaFwLpCIRcktkUhlHRuzZskjFIrD6PYZ101nfIspqhAhQF9DwexpmnXRQ5ky16gVErQUAxe fiRgGNK3PU7DlfZmUThcWF5UF4+O+65iqkp9MZoftsYP3TBRTxtLoKUky6KF5Y5MPxBprTPAmjPs ZvIxrB6HPC3ZUcKqIsIcFGCrhlsg4zT1orJYsEk9SP+M/P/i7kinChIerOemIA==