# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100622100527-o6edtjhfwp08urbu # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 76ac77fc06bdff993a445fd3740a4ab0fea893a4 # timestamp: 2010-06-22 13:05:34 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100622075822-\ # 33le940p3ek8rp46 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdt42HQAAYzflAAwU3f//1uC CgC//9/wBAAIAFADnTwACQAMpoSnhTT9GqPCmaeqPJqGmj1GQyaeoAcwCYATAACYAAmAAcwCYATA ACYAAmAART9KAgMTIyAyZNMmhkMhkyaaCSQjTEBNMhpTamACm1NNNDRkxAGVrXpFNZSpuqka4amx kRKJAzdM1V8DgALz3QrSUBbUEUn75Pv3UTCVe/89ckZRcxG72LClDNi/oET9GvwARQDi0YT0UXyI 36b2pdIXZAjYfc4nlOebDjcDO9tTIqjESLb+wRDhbSLxbmYThhF+SRsnutyYfgBWt7hFfcyq+wvG t/xBlFv1UFBXi0q7ZisEeNWvX9jk+Fc1Cp6nY6mWh3r5mcoy+aY+HphyuqKMrNuJXnxhqnCJ6coI N6cgwhDa2LhXEHrF4cv3b5IvkYuM83GSaVxVGtY2K41WG9TxYrT9n8WitJvrbkZKwyLcZa7Z0L8x PPc4z5q5np6zKEUQusrV5GmUm3QlwZBhnjNYYqE1huOsTPLyCVDC/FnLJQWSr2UVnhgu6+2+tU1U HqMrCjh9k6zcPOioJ62h+baLRSNSQ832m/dGo8ZQsC1zqaa5uqmD3lbk0WqLAjY1yn8Th4amFrd7 /d2eV68+Qi2SZm/n2+kIow7WI7YZRc79Hh4VP+7VFTWDw46Ls94jkdkr95f5JEOtsHhDiI9OW/PO NLEf5IR+K3LwzXLpt2rrtH3AfVFb/l8OIMUUOHV5lDpgVHNeJ6qPaty57z9ndGucyRtuSMuR3Yle nXdkUtVS0c9e3stHUKHTRdZVZWJ23hjrlZAE4t/iTn86laTPDWzn3s6NEdKuXtATWRCcFQ0wxYrr wdHrNi0U/gg8yRSKZAithUa66860Sa0WwlEgNcZXB5lOFKz1R6gjWCwuEKnDLs1ch+xpWeR3ieeI n8J9+wzBdV+BXLqhzJFPPBNDYpvX3gbiPaF08aUrj1evDOeAdodbjuxFfgm3riI+uIapHpUEwm4S 2kkN5JieHvjsoMWaJFBGa+Z7DO1xUSXH/dI4nC6MCA56c0bINAI1OXOeS6NCvg7ViSZkzJln1JEx RHTr87AVgelR9EjqCNFY9Yetp7C08VRaG7VzKo/ucLdHfeOuhu4spJLK6UxVFaKE/fWSrsikPTZv s9VWV1Jk3a/8U1uMXlI7A6+Z5NTBqSQ+mUqiDa/kquc0J2nfZlK0vFIJA9QcsJWhNNY5yDnFb57x Vlu4bK5PC3XnaKAW2jG6e7JV/8X/T/xdyRThQkNt42HQ