# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110127081200-xib4soiobnw0wf1q # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 7ea82954b39405551f2f96289a2df45891c3b23e # timestamp: 2011-01-27 10:12:09 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110126080252-\ # vlp173hj98x1orek # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZ5pvC4AAZBflAAwWmP//1sC EAC////wBAAIAFADjvB6KHIGnDRI0NR6h6mmnkIBoyAGgAAwAAAAAAAAAADJJtCam1ATeqeo0wBN BkZDEwCKehTCM0NT0TEZGTIMjEMmRowkkJpoNExDQTKY00GiJ5R6janigzXHM466eYkdEJrr160F mChgS8byEauSrq3GZlsTvLsmGQ5YxESGMX8ngcGR8X5DajBBiuiDRCBoZ87HgOvtT0UAgrrwUSZf DVyK4r/BH9LioqVXl79NrKwXJqGtW9I37EjTjOyLwOOVYnzSDNUJHuZZKBtO167XLeKHbUyZPrao th0WOpfItAuymlBy/H7N2MRGL4PWQmwZBJo4Z6y2ek1QXqR+Lpeys2FC6eMStleZaZfS2io7FCkW nqEO07ilMPZkw4cKVmzAcRqUb2DP2b2Rar1NMWUNulBZGO4XFki3zaLKSwSi0QOBNSilT6B8yly2 QsNs9ajd04BfOWWSqMdRjRcjAoDKlr9Twbi6Y0pYFayIYYRYuUZFLtE7Ys0QG6r05blLVJWMSm9O LmMSsrgprNMLe8lRVosjHSrLblZMiamoWlv9Uxy6lnSRblamgWBFqgPYUeiiAD4JEx+hP48pipnt Ri6/O5ZpFNjDM39s6COEzfczFE2D9floHPI2FAZLIhvSPvd4d4Kc3BPWkd2h+NF+daPipI82oYOX cqbRZHNtvccgf/AoRSNHj+EMWKsk5uPeoPe5MnJ7ce/68N08WZIumkX/UOCw4ccu07XYE7lpqTnq s0mebVW9E63AyYsgW/B93UkC4oYhkgqzJbUaFKAzzthaGX8TzDofqwGVdyg5+yBYAKP7EL8xIJqJ 5ZGpw4VB9UZgUREmCWklpheItXgzzr4dSzxTWET55+OTGLeI+tuYu6ZmH1nLyVqvgaNvoL7V6Y9q 8Y4eb01f31GwHms7gw1y/e26j8Cq2ByDsdz9Fw0pty4pHzmGwFAKgqckuEkhjnVo7L1KWCR+UjIP c4jO16EWyhcaq4UUFDmhFg3wgD3uH7b0/XUKl7ky/QuHDeyRAVOc/W7aKAKKOjonh8JFgeqmjg9Y azers2ZPINHVCpGttZmykCsQDxsMKkdacSiGNwBeRVFsnBWgIXXqOdbo1RS2jKwaS57hSIootDy6 nb4vgWzc+yBs01Y4zLabArRBPoetE9GsFhtpVeidaqRknCt8heiqoFEHKrC8h/wn3mLuSKcKEhPN N4XA