# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20101128110230-rym0dt994kugjba0 # target_branch: file:///Users/mz/mysql/ndb-6.3-duplicate-symbols-fix/ # testament_sha1: 3bb13bf03a2fce53e4562c301ab6fdbcb8062ba5 # timestamp: 2010-11-28 12:02:36 +0100 # base_revision_id: martin.zaun@oracle.com-20101128105659-\ # tufn7fmht37vuptj # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaIhDx0AAdJfgEAQUGP/91cD HhC////wUAQOvePKJu0atOtsJSEnqelP1J4o9ojaQj0ajTTCaDEMgSSII2EyE0m1R6TT1AAYhoDI JIQmhMmQEyaEDQ9T1NABppoGp6kCeo0aeoDIGmjQyAxA0xMJJCaZTKn7SJPaU3o1NoU9E0GCMQZJ Z6+Xbdz57NzMPH3eZLHpTJQiJjattBZIty1taySzZKxE273+7RJQB7oQBkZubQ8whZwlkhZSXoki 6VLaSwoOiC/4UxPnrVV0lWh3RdCchqRakNDFUNOYhbXxVpfW7AcokwtdtmlQyanR61iKXJFWT32V QYRCgDydohwPI4nKLlqZBr7HahAo1RU7UxQ1QIghCZhb7Z8mInNVI22KSopnULKs78J44ltHEY4b rsWQfDFyoqLeZ675Cog0zpoqgupdXa75hZ4HjdXCyj7ekzupe2Kjx551xVTKZDohNONmzxTtK6jC cwXoGSbpk4ItUgXPw00wcJ8m5M26y1jxNJXHmWpftgZ+tUh2nklsqdewZpDI4D4E/IsE1C7RoK0a Y155FH1Ycpcwo81KVUX0Kqdg8yGtxoXz2jy5Ejx2v66jyq03J2Gmi91mJQ4ZfXeRWLKEFH2KV6uj DLOVqE5lvZ4xlc6BtYXdNLd2Mh2Ywywd1E5C4YzHzpyFrOLatLRwwrpvgjc0xaHM6UkmsahUK0bm YbNLW79q3fTviQilrJj7/j9yn7tFzcW9/J8vaTrK1HPpA9lBdkw7uFSB8ve7tEcWi5wi1gpSnCF1 BFLEX/vEE8aTe14hC1BM1PiQ0GNpwEUIXGhxronzvPU0ogtLdT8T+md/9ZGPW+xxD4JGMivgxRi/ T6XtvUl6x4WToXeyQ6+L5FVjphPrvmxXh5LRDkIZalebIj8t0Mz1Le4PXE/JcX7OthCS+26FaviS EslPkrPzWNtPgFJQyiK77rrXZ2oiKbukDwwJtbBJ1FpCwlOG8wq84kthMdvefutmq5NiWb6lzgNH t4JKNQrAy5nAx5m8Ga3z6lqETA3m1xm1qonp2op140YY4p1aaYrBO4KOmaDKgyBMV8SbBVyOwVyx WAR3C9dwPCbgtz2zEMZZ9Gd1ajok8R4izfcHM+Yz8OpWYyvN6ze6bEy2/zpk1GSGtTQIk7LY+IaC GhCNfIlGvi82hbWKLJl1j9WGeqZsEpBycdJInrEPErwetr1PZuV+vBmUCbEffAR0wa+I5cTaWU4Y OThHUwlwYLEVjzyPSb+yBgYLfZpsrYFUFBXYyYb4vro0XGjxxB3jNdnHNtlggwEXo1GHaa8rOTiI M1iYiiQT6Dw/c22y/MS4krN9aDAqKO4iJOX4atzlxUlTFeo6C7KJFsetXawWfyeERydl1xKLgVBp QSfW3w6hFZlCV+Z/xdyRThQkKIhDx0A=