# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101021083043-3634qa1cfeeyit1h # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: c13180cc263590309331fe39dc5e893d112c7fe7 # timestamp: 2010-10-21 11:30:51 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20101021074544-\ # qpi45e7rtxst32m4 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWV/9TjAAAi/flAAQWOf//1NC BAC////wBAAIAFAE+PHo9SZe3bjrb3de7OEkkTQZI0/VHp6p4U02po8p+qepoAGgCUk0GCNMqfpE eo9QAGmgAABKE0QTTU9I8mSaNAA0aZANGIJFJqnhDTU0ZNNNknpPSaPUDQaA0BJITIABMIU8g01G poeoYIekZabLczqR2ZDSStIBdYuKdBFcxXM8ZsqwbTGw8DAVVRV2egfTynHXG47NBalKt+63DdZW p668HNsD4pY5JosQroeFxKBtgTTjJ1e32UDhkmd0zmF6kTC/JaVfX5g9hHw89B47xqlSNwejBCfA Bm9S/jgNLpditmJtzONT/vqhZ7AoCpzKyp8iCRnc5njbChYOQnpGI1zJD3E1wDSe4mT/0dAYCccD 8zGZgaywmljrzF5UouYaqiTFbQu9pGRYGBboLY4MkiyuMuo8KovxMOx9jPU9mKXTg2wNafi3caiD UfLQXlMqhiLgIkxp4nMB7HJIOAKgMTU56NPuOOL3BlsURMYvRuRHG2bjJVjq4Vtf7jwKGoAeOJVk 0eg5AVHSADmFjB8SuJ9nBhEe1FjkmrNoV5MPRWBbUXfCKlgpbJt5zlwrDNQnN8eyj7jwNRgaSWDX MgMvalEqTLY+20rCgXOFJ0v6DO+1tSWGXLDXfBgqsCTS6zM0Mby2i3CykAXzjR+JE0OLlWRKaQtw 9GJc15aEIWYO5UOIBk4CbN5Afd1thdaPCY2pJzDF6M6yY5VvIWms5aOMqSvIv8r5RCDKcNXG5aKg 6IhPAHO5VQieh7i9V7KsDb5m9I1A5/Qu1bc4LFMNtj30yWRckHIq1MoFNRBLuukDo9hT6YVukL3A y42V0gvzseq+eiFGF70dpGwKf0fWwzbSAQ0Qw1q16XcuHGCcBI7IxnjrI2lyqvrLFUQhsJFyW2HB UJRVyVxaUR2+NQFevCscGhaxKOBbhG8620MDWwGAqeRRiDdoZLdkm4m2BSZK7RKzRRdIWjatilJE lWPhhRg8xJZY86zlsTcFkOVw7SrxkMZZbOSp6SK/DA4Yt0tA068rqtWp+rj2BYDYHJa904Jt95qy V6td0oIyQzluVDkQRYBNfqRPUmhwLzwNneew7FcgGWC9F+DsTnNjuyaYD4kA5a4JozGdqlm4hpE1 FcMMspJOdeNGrRQQViJey9Hu6OyzNhZQPzqHZF1iiQ/oqd/vLWfetg7yOyG/gC/d+5TtnyFm0eC4 WIpQvGYN86J5AZJgXIXhGhCgECJizNKy0aomkIkvmAXp7gWVbzemQsypQGOeNRfqHhKKR3uEQ1Km g5Scig6sqKinXrHHhmEnZoGYGXx782Be0gyDmJYs+cV9REwQuxFCxctmqnNpYYGcrpftyzVTGWoD fTfUsSzpsUw1wgwseRStPBW+d6mUerJyFSuGimpmAjH6KTlvXvp3C0SzZPeLmzqJWK1KIkEFDghK FB2KkM0U5DQyN3k8qpFcIsYMMPnJATDpNEpCDUkK5ZlUUKdHKh2lo+pFQNBwVuXcxwX2ZBxnUWsp 2LVoBYoGSWRdQSHfLNRR5G5fdcN4tWazgWTWyLFt1lE/ib5/xdyRThQkF/9TjAA=