# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: sunny.bains@oracle.com-20110421221539-ibcnm8lbiysathlt # target_branch: file:///Users/sunny/innodb/bzr/trunk/ # testament_sha1: a5c4edb34c6ab8e6027ec7fc94ee5c752c5a9c01 # timestamp: 2011-04-22 08:16:27 +1000 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # 5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110421092445-\ # 13329p4tqicfj583 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaN0IOIAAcjfgEAQUuf/93+t v4C////wUASGeAG2GIAAaJpE0PUw01DTQwkZANBoeoYTTIaDmjJiYAJiMCNMCDEYJkwCMGpk00mU 1GBoGpiZMBAwEBoGI0OaMmJgAmIwI0wIMRgmTAIwSRBMgEaBNNJphMgJgCDQyaabUYOpkU42+XAS 3zGBs8ICXsTF7jAhSdDn4JYsxthGFt4zMgzYJVvx63KqkfhNxoihA8qSnVyPs8VacRC1htfuxy8C KJSIymuyPej/ZzmicNWQoGxQ5QFILO9vFrwQyoz+INEViaSyB0Si50pkSKYR810RNbXewGTEYJcl ugfyzpX3EfVdSsTCpd9uzmhfrJu+qk4slknEcVTOs5UOuSCrvAN5sfgdgjerH7nET0UtyimNE6ey sGO1R0X5sxUWXR7aiLV/pn5cBFSEYKcxVh0att1uabGluxfI/GOIqYHyVYHfpv7ZbDExZcOO/OtN dnHYIhuZBoKQuDa43rLhD1K5a6Bp8W96LMSrzKJljjsjtzntxiqSFK5u281rmIbloNOrLN3zEZbK x55qxXVlVsDE3LTDgq1GtXBF/l0gE1QwFy1ss1+FLNePasit73WRbR87qD7O7YimWahVabsu6NFB GRnbaE1rW9PjBTrqNqbmOm+tzX5F0u8WeBrWKUteKZQH5zVBrI4LA3dPXqsKmF4cLm33wsaGTS1r CBJ01jSKAxZRrVXd7Dv58hiuhG880RTDGRgtPGEa2RGZmfwunVk3puuweyuP0chDgm/PRo9Eit08 OTahVfelQdW/II6BwECpQeqMbxK/N1kBP4oHs8CAejtXcepd3Z4Witsb4fFIwWJSUIhb0ntS8qu+ VNIe6sTR0+ODp0VX9QeYNiJqQwde9vYehL2+5ahcb/8OO4WtLycJl3WkxivS1nRkeJcghS3JVir6 /Dwma14mzX83UdIjBwjFIwE5qEXaoWTuYe1tbM7mfO5nfjNPlUpiya6awklEkZ2FUFBtx8PpRW4x yNDWRbVIAiGocz2/CHgCpx0U1xvQaM9OYaFMfAjbFWgglFE4eFVbpD127+ZrazyfahAUna4pSMkD pruVZ0Vnjqy21ILQuAWyR4oe02nFnN50suYip9BPE3+zl2TXJ11ncQRYik8G3A2i7bXPmyLpEYLi NIYULMCBnv7xeCfOHrTdtnEt3qC2YHWGP2k0JIPzzbbLEWgx02kXOwPPHq6hUjkuItqZA2S2hCu5 OHAKhV0od4n6ezA8bK9u0okRL5aUgvBdaY+sJMT3CyoYCNBN+i5lsVMYMb56EnkSvIOxFh9r+plK SkEGQ/VgGwTIJnimgmriTKDJllFgG48rFrALTUeM2QEfRi5B55lbf2EODrk6xNLrejgSbo8y3Q4u ycrmX75zwW6zeMy+jiWMlGQw2+jop0QJdUlVUvi0iMUMmw1NxYYYz42xoc/GgFWXR5BT264sUz1T yCFqxiYynCiPqdQzm0s0wrDw55QUzXqeEPuYhwa4hPVEdhGYxRK3xwyLsIsqEnuCS9ainsB8KRWe h8+WHVyKB9DFKTan9Lvg2C0B8hV80VLDJpQZgGZsxWsT+H/i7kinChIUboQcQA==