# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101201080353-2i2qyp0iars3nt1i # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 768bb3ef8645a0263020f4c0ba6fdfc4d06d52cb # timestamp: 2010-12-01 10:29:29 +0200 # base_revision_id: kevin.lewis@oracle.com-20101130160355-\ # kzjegfh9pnd6pbc3 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWX1Rpy0AAZ9flEAwWnP/93tn ngC////wBAAIAFADwbAbe1FWadwyRE2IQ2pgCap4TJkhp5T1PUep6gPRPUBJQmjTIMmpT9CmYoDQ aANMgAADEgSn6o2UYahgmmhoNA0GhoYgA5piZMmjCYJiaYBMAhgjAjAJKaqe1EzU9T9RPCam1PUG j0nqGgBkAAeoxrWpr7cideY4WWtFTkulICrq13Wqy/J3jTkaiIOsx/UET5FqRa1f1/LvP06V7Rm7 CFJsQ+7V0dYUxcKu/pzWpBvQZY2pTcG1XLnIUh20T9gwPGbPF5YJtXaewI2A/k+J7tNMfhsP7TUl kby8kXuKADD23TwxxNgBlTOQAoDOUJgMxPOVmRuNAnl6oh71BBjR023dp4DiBdUDmySBGVAv4/ye PfeWhOx7kEGVntgnLrcxhnDlBe5eAxNPFXpyw2bnE9zVXy6wOgUOJW/mERFIpztt5D7lrRwadSWP PiKgu5J+Ap4yTDOzJA4tWaYQmuAdAqWyNGRYjauLso4WmS1HlVZaPVNzoduwT+Cant2y2dWeabrE rExsDU0oszbK5pgy5RIzmnFl4yUk3O1Py6d7lNQJ2xWqaXmLFWcC4mZGmI+KxxFfqm2PL9OL8n52 l0ap5lUa1M2FJXGG/dR5keRSqzY8WNhTG9loUMnEGlGJCGgRMRvIVeY9lIsk3LXiE+r335Rlv0lC enF00hREe4XvfTFRmTok/VnGsThrQ1aafibhVT6jc789rDgYDdyrmXOF4f5Ny6L4McQOp5i0z6AL otPakWw6dqIHy3gLp6MU6HcwH1YAIgaoNYgDwnx5F4rR9LT7jc6SSwpVz0g4pgpmwwcQGDuwRJ6k BrjWNuhxhb2GSJEjEzjkv4MaDlEJUs6N6pOJZRJEaxrYwK1po0rAPMUD6uGiDPfs12NjRUcZEuDj bLfLjTDubqMehI/VQ3kBdQ3FDRNUp9qCcS1ilJC4CotMFsUhu0jXgoWHZZgBgHCY/zwcKxxYSKmA rK1KVwTqgx5COI75TEnJ5YKOhY6mEmbbMb1Ocy4PM8AgOg4AZW+kNtELBUBpGncZANWTE+I2RVUO JQPyCyBSgfOsoSBIwLM9IcWqMnzZ9jBLYxki7MAVeg0BNfsmp02W9Nzx41xgggijtRLjkKfS1dpN Q/KCgHBFHf4cW2wAuChwpv9d4AzBwxGokRgSF6i+ERDiDVLelaIU8zAGbfwZLGYvIG6wBpJasyYi WOwJUwIFBrtB9iTRBkZRJRU7KhARNoGBaN3iiqUMDCMgFIW1KZUSGa8Sy1hppnxqGBCE84jCy8Io s/iO/lc9Z1ma8mM4XYT9JKSqlQpzOWcRMpmC4U7yYpV/+Iaf8XckU4UJB9UactA=