# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100909112752-ac5w7zyzbv10nvi1 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 06a5cccc202e8b6e666659d1ada2e7edbe9a1472 # timestamp: 2010-09-09 14:28:02 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100909105006-\ # fzihgkd7gjx7ac9s # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUB7wZ8AAtPflEAUUmP/938m e0C//9/wBAAIAFAFPluO01mzXKzbWubatwkpqaamaiep6Tap+TVP0ANJMh6j1PSGRk8oaBJUyZAG jKp+Cp6n5KAHqAAAAPUCSTQmmknqeU9Gk0ninkg0AaNDIANA5hMAmAEwmE0wAACZNNAwkkJkRptT BTyap6R6nqGTIM1ANDQNCZeW55sd305fHEp0k/Jsa3UYOITCDLMzcJ9I9+j9IwdiHHVkuS1JmZmG YO65d8I2GyiCzrcsJQeTocqWg71/OL7+3f/fHnnXo95WpZOciFCNeDr0ZoasozZRqmTZYaxE8wj6 kiSJFJxfml1MSABWlf2UuRuIqSwas87Px0S7H1yrzLnarJLcfzSy3iXKs1Zy0WN0gJs7I2snZlyJ mGEoyEHFJ7DiQiUmGCpJOlm5FSaLEhoEZjoWaFvyKUZDK017HLr6v6UmEWm0sGCA8HsrOEhB7JbV wlw0J/ghoIkIryjKtKOSoiIhB+VecmaDiTooYXTYKkb+8GGhX60tzWPSWA/ofhZgRjNrUyW4cb6c yhoiMdW8QQIq+Sqe6HNQ8RoTIcTCjW0itK54u3EZuxCeTLDfdsHbCJq2nTphbFiCt0b3HK6EoGm6 XVVKbFTTunSiMmdMsidA+oqBybEqHlw0WJhMZr6M0omG2klPfg5SIZT7WRmq1fx2BG81ZyJyjUra maq+6CVuRUFhWOgXJMLpdXNEaUbHpKQkaGeN0KnWJNJzRp100RkYYFUnGIXXN0zNeLNCaW0zEWxS eJEktixL70ZLEkXESuK3teIjdGZdTBLYWMGpKFJnVQMRycUDzSRGGsvvrjNr6B09dTUjc1yTkhQI abHpXDioNpW62454DBxCJHpK5yowsgK98htLaHTPsDJoSchotQFQpUtUiB7Qw5ea21VjOB3Unp+7 gsLjajtNIlho+0pGQc5wOPn0v55PIpjPPFIg3p+Jia+C5tx5PpxY3GVhhcOUgtowGMl2GdLTuNdx eJbTwhE1dYjpUOrtAJwLTrKSBhEXeukS9/JbluiuWM0FVQlNxOnwHrDm4cXGdKRxZaUSnEzYCCVZ 6mAwb1ZoEd/zJF6XF5VBpOTziN0uY05pUOXS72pOIJVD8JZxmJ2TADFyQFfGQWEJdzEvNC61D0fF Na9iVfIeN50rlZItzS4heaV6vQHBjOxhwkajwhjjztlc+MKSWqJNaaFrWGtxvc1KpFo7tYY8k9U/ dbdGx2PQnwo702P2YPSX8x5+QIRTEMNI4voOepSJ6TOdSUeRxEqGkLbEsMAtcdQQOHNOLFetqoix ebFOlf1qtTT4NuAq9Ty1UWAxvzGQW6DrlXbPwSdHQOdWrNJPPrKWbuS2CkydjzF0z2whQKoWLXUn rt7ylXSocy0oD884uhJbltC4V0BA6C0AYVMOE5Lv8FLFkAcG4CWa+p1gyhsxVE+BrtgrpSB3aODI 3Klikgi0KBxvkB4PW4JAOZDLoEcfKkm7IhsrYl1WCBhbmedADKKK97LsqCG9Ns76LHJyHhVNGvvm /NNTEjrToJcah69FMPHRJVTP2kdBOckdUFYPHm9rlQtLiKwK4TKZHumICl2l0nAn2araHtIvAWDP frF57MvDyFaiZM0EdkXRjqmaahxf2Gq1D3372nWniHExvg01FhGYrv6X+MRWrOyhcsqkq1OWLHy2 VZ0EZEdxGYbK6Aj/F1v/F3JFOFCQQHvBnw==