# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: magnus.blaudd@sun.com-20100614121727-2xy355s5fhxudckb # target_branch: file:///home/msvensson/mysql/7.1/ # testament_sha1: 7593177bf6c1d6d9016c58ade0781df4c1037529 # timestamp: 2010-06-14 14:25:01 +0200 # source_branch: file:///home/msvensson/mysql/7.0/ # base_revision_id: jonas@mysql.com-20100614111117-l9u2pp97c0jkjzjq # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaFFN7UAAn9flGAQUm///3oL QgC////wAgAIAFAFDXsqHQ3GSAGjwyRNNCmYk8QwjKejUxqNGQ0MEANSTyNT0nqaNqepoDTQA0Gm EGmhkMJJASYmpo9Go0AZHqDQGQBoAcwCaYBMhgACYJgAAAkkJpoDQE0Ke1A0jKNqaM1ABmoLhOOk Tpw+xeJqJ0fDiGieR2MjDOoGBqKCmPLFNOIr9/klphV6D9zugwzKjxDXAwRZ1bsj2bVlgRg65xqN ZP1pGhkfRFodL1yxKmGrmkIwYPnhtAc0KBz7EFCWRKicVCOfakHQIZHguzuKh8VtmXGnusNB7tkE jZk7GtJYisST1fRGFPA5xy6JBjZMzDVDkgYSMbtq8niMxmfC4okkHs4ngW8XWqBKbkSRRzYcB2zJ GzYYVKCByBlXiE2UWUIFpuVpBZQuIYzJIIK5ycmUCJN6FMdiplcaa6CSLEggZMpWU7sduSCpgoNS 4+FOIXZU+FV8dLB5dQpIJ/zi92UUG3vWgyQTvQp1LCxw11dQSkPycKjTdBsufuP8UPZYhbPeRggy wH6XYU9odB+Zl3l6Ha16Su4KTUl5TiTN70oL6oHJBAnvbCnkM4s52jWW9Ba8JGjFSjq+ZyC/bSnT EKlCXAY+IHSVCyYCPOkYYMAU+EIU5qAWGgEtF7hkyQXmrILjbPZi0KLCYT0kWYUOOz7TfgUh6q/x i50OpMOGFaxiUGGdBYKkwRVyVHHN/IutgbE6nUIM60Mr6Z1ZBHbtQQHVFhgNDEwIcV48J1asXVwv DxWzy4JMqYPLx9Rm6FZMeQKBqCoVKGHqER6GJjSVAo0DHh3rCdJdS1+MLTy59BHOKRJnwPlEKBHq eUI4s5VGL66RCRoAj3LOGW2hgNV1A3Z60b4+FufTnjEcj5kG0nqHyTKwbMmQtE2SIAMB84CtBrJM OLcLkXLRXjd2BAoOqF4e8j1pjJN47J8aheSrNZhPBYoM259/0LR8Crh1hSU4nQ7fnFxeEh60QjMZ QOXLSZr1IUGs8ryt2AZ1ocZxCKSfh9XKRoLJkSywvCWasb965E3uDAyVdTU7h367mUJqCgqGEnU7 NbbmDxsEVdlYkmgWWtzBk0AbAoOpxCAWnkChDTblyhl+KPcdxsUsVpOBw7It32H9DPvtjmUIoNi5 ah9ff88+blubMZ4Hxg94hd59yqOJwThWVyLKcguDOtbFsiskfYGIm6vsTwtqxFc798zAgYpfgaJc Pbc/gjZr6LyOiuF1WK19GPgwR5iyT0dnkLsA3xFMxHQAguqS4KR4YDuRWfLEtNskH5HE1Qif7H5j cgYc7sIomPMg6FR5rwiRXX6C0qkOSTDIKXPY8WFIeKXbgUELnnmXqHRAzI+SAcLcwlQr+NFdFnck ipLvF4FMVUlYj4uFDxrgp6pjqnrhqMyGgokJr5KWMjsQYr71oMXC5cA+OxNLMhGKCw8TNXkfQbpy oLEQ14xccoFEWFqe2bkk7cMBWYlRLF6ZYiy1JpnYwzZs7XijUVwK3rprFXnSTp8exaPG8h+LDjAv 1NyMlPkWh7WdWSuSoZEj1XwOOAf6XJJy1NyuxJeaD0TrkBxi4WnrrzSfdaecA0ByihgYJkxhgZFq BgnocxaKZdA8lcf8WnQu5IpwoSFCim9q