# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100622104317-5xl3suwp1hqjtd80 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 42637d2aac6c210255d21bb6e413f6c9e38d0b1c # timestamp: 2010-06-22 13:43:24 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100622104239-\ # 0lpbu70us50jaqfs # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTnRdlIAAcDflAAwUnf//3uS CCC////wBAAIAFAD+T27RnXboNzTsJJEGiaNNMmTKYFPKehoT0QxMmTIDKaJNpppkNNUw1NAHqAA aAAAkUBBE2mp6nop6aIyMmIaNDRoZDQcwCaYBMhgACYJgAAAkkQTCntUHoan6o9JoDQBk0AaeoDQ 202lXSbNWECO6APvxOzPZUyji92pI26eCEbKE4wjv4dGlto7+4K/mdjMOWmiU3yOhOk4y8/LuD+7 H9fLh3fmqH6hFbJ7uftmHkbHj3aMDzsMJgcwZFEZficqOPZ1jwqJQeR8IiZalq9hHotgolQvpRw9 adWq2Of4UiRt4cgifHtVT2EiDdcOZwhtAi9PGc4Q9YhF5HNLRLpg01dPZstndPtW5ZqCzWBa0N2c 9wjr11wQZ83yMl0QDyyhxcpwlbAXHYGfVVGwqaD17y4aUFeKGlcM9vBvyQFUPEZHBKxcgcgdbYol k1hjoW5KEdba0NAq1CMBGuOCpipLFAtQYLbiukvN7jULNQK6xerQ4pWEBwXio2nOdaC/RjT1GQdQ LTcqwwA2izOIgzDbpzLqtKEC+SCMyy2JXF5pgj4BAU4TRRBRZEzlpNLhjy1alFmmSgjRkoegsVzG YbZ231niMlhrUltu0+bgnm1SyF5Dg667KBPPTGGVkKZBGJOCdXMsCsGxKc0JjwLjuY67iQx8Xx6t 3Kld+kRjMQMeff6RSovOR1eB6cHCsYdsUdUwj0uZMIQK/s4uWlA3+smpF3GI5ac8OlInreEGkBgi Ij1si3emw+1fQjCkR4sVt12q1jp1l6biQ5Y79uZZV7o4xR/s8x3P6pMVLtajdMokXjIswkat925w dqcCoIoka7SRPJxlxREnWPOYsN4nxqlvHwTG2q/wWwjlbP5E/J4+8aWIFvsi0kH209BbQQ5cZZy1 2OQHsGacw+/ZlvymvZmrbT01QidBtHq48kiyCyJlXZC5zraTDTeTIpgn4KZMouHVwwLt12smE5QK i7Ke3DfKua1PKflM8yCTrX7rxmRjjzioF0RXkxNxyLW6PAsXy8+a4bgyZqMWKTq7dFk2cN4bnV4L AVNKaIjCAXJGiIfoqwreJZqUhlSbeeqCxXqZDKjNI0iMl4HQOGzFWx1GdsJSJRkm999HIM5wJPjt xCNMZRydo2m01r3pFU6dNQVA9sjxSOYLrlB6p6aIaHV8hWEakaoM8TKClPeeOiz+/iaJ3wSaL1zE 3EF6S14VJE0XX+qZZStUiKcuKVgqFJJrswUeee1aNtFhEv4wdp1O0mjuFhbjYF8pEN3QUNXgKNaa MBtswdAOAaAhWhua0vNyEIAZUmbsjmL9QYDNdkTDYPpUYOybtlwo+YmVW2pXT3Wkv+K/T/i7kinC hIHOi7KQ