# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110609185041-f5ur24c5mj7rg1cu # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.1/ # testament_sha1: 111c3f614066bb12f74c4df6429bb4fb3c2c7491 # timestamp: 2011-06-09 21:50:55 +0300 # base_revision_id: dmitry.shulga@oracle.com-20110609180510-\ # lb4rm5p5qib7dnos # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUgeIoIAAnjflAAwWnP/91fn hwC////0BAAIAFAFjeZOgjudQKUAASSp6nqniT0yNMiPImTJpo9RpoAaDI0aBlExU9TeDSamp6Ro AAAaDQANAGp6pqeRDQzKDQAAAAAAADmATATIwAjExMJhMENMTTASSAhpMRoymmBDRT00E2kaNPU0 BmoYDhITsG1US1cAx66jYVU0UmAOOSq6CcPe51MNXw9hduvhsQnMCQSSUck7kdlR5rghImOLEtaV LLfvND8VvtP1Dj9v79D+GNZKQS3L09Sw7CyouKx9cY3jEloctw95a8+Cs+49Rfcw8J3vNQ/fMpCB IhyNvdyD7m7vM9vUA5hVZykUISEimmr0rlYKwdOxoVxc6+0LasmhYE5RroAwzPX1hM8l4fZhvioE ocaREucOwotcRxfKsjAFRJjs080LsUeoY2OWoDzVKhSQqnVv+CFkhyr3FCZdGiyFerYOViDoyvXt 3EkL38DXXpRINQxthhW49bFsF6tMQiw8YHKdEEHcUfqHNAxEHAaTZl8KF4ymbT3AQcauG27Mr36U Ke66GDiVg5QHrHABzuChCCNXiwzfkI2ItyLJh1tpHVbM7puvsfFQ12rfot1XLM4kQpJQiYsPAiyv Th5ouTmuHletbIkVXGJfCoyUbDNRAwKgxI11k8AKKUbZhqNV5uHMokjCtallFOgVWD1vNIHinLQB SbyDXJs4PiZxLbZlKAULlXlA0PFiKcQouwOLGY2iVxbIOEReJTAaLarwNNAAVOjTFZyGaxIXCgsJ FVCako55cXhiiRE2BAHXPFtUxIYdCpjHE5pSQNLCGJAlFUCIUoUtIBdK0PIDyzA8STnQ3JMgAL5o HOKuU5JBYhLYo4GZMzRrcaweM5wZNYQRCPsPk8DYfQRGZFrhhDgRtHJ4MEQbjcw1kz8Up8vcvAgc IszmRL4np9T0mis9uBAXQ7k3geEiiZBE35S309PbJ3WCwJY7k9fV1l6OFHaX+pI8dZbwj8RKpbU8 yX2tSORFTfwGXOxeS86HWHMNxt4rJaHFRFbyBkWezqMoR+Z8UmDSuXYWfKmgDSuM0YYJx+awLySg q5Hbb6fRducEzAGyhrEnFj9CtHKWIEBHGsd1PM+7I6p3hEGyHosx6K8qM1cQL5YT4DghaWqoobSR 3LWqJ+sw+rztIWjhwwZHq8A053rZ44QbT2mRsJ1eJ3juw8WdgXlyNLsII1BVEpAj9TSQWk56sWdA LMR5rlLV7rBpSMQ00yqTAwR8dCusJljZETUlSJkkd5CQWxWJwT++B0A5Dg5jtq5qxWn2PAmUDcw4 6GZA3s2sCw7VcLnmzCzF+LKjz31kR9lSolcP3ppKC/OhqCCfaaYFzF4rMEQoiJ7GVDEA03mcA8l/ m/bOmaN4/070dxwYJzNDwOK3CZYpH33oxBTXM48goiEB4OZI5Jw95vcUEmBtyjanYu6k+ESqCFam 8kjM/k80w7rkt9pC4yOabmBapSUzaOq64odK9w4H0HVD4JPGBmDZiLQnqpRcDkzBNy5c9CZIp4pl sQEhTPY+Bv8xKtEFYOGVblyWjtrSC/KsyV2TDBBVPVMYtJcdYZNABiq9DJBxtTksS1SKkqcYL3gb SU7SoF7FYomiRW2HqLyEwcy6pBXWLJ4OHjJrTeorXmSg+c1jtUMAwpFYvHnYrEPKBb8dBNthYiY0 L0xWXOYl+gOvds0PHkAwDowHlZZjboG67CpUSouBvIPqE4oq4A6tLW0/m3JS51CtbmBWajC2pSDN EEguWbqECIyXQu1wFinUUvUof8XfT/xdyRThQkEgeIoI