# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20101128105659-tufn7fmht37vuptj # target_branch: file:///Users/mz/mysql/ndb-6.3-duplicate-symbols-fix/ # testament_sha1: 04cfbdf5a81fab2505b89336e5dd78c98d3a0cb3 # timestamp: 2010-11-28 11:57:11 +0100 # base_revision_id: martin.skold@mysql.com-20101126142647-\ # ehn9p6co4rykoihy # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWb25wIMAAV7fgAAQUGP/91IC ABC////wUAOV3ve1qe0O95Xc8JRICZGTTSPTAp5qZNNGpkGgZIjQyMmk2lP1JpmTKGjQAAyTQFPI 1TankNJoehNNqBkAGSEJhND01HqMTTQAGg0MJKj0QMkE8mBR6Q9JoNAAfIdYeIvEBjbFoxQhTFOW rc6zOGkkRB16D4oqe1dqULZAdu+Z39M0JYPLLVHlIqvELldeIxRLjjSyEmEKbGp7SikXBPT252g1 B1q5BUYSVHak6AihJYHsB0TKsCoyiJRDolZiUjxMx2ycJpU9byydooeZuEc4hvEt7iAxZEB7Zwtn MdD6i499JceceNKok6x0LpYHxCbAFBmEg00mGgWT3vUBMc5Vlt+GRong7eDO7fMfNOmJ+jysoOyR TjG5kajsreJnmrsWkidRA2IpNgTwP9eBcNhqA2sFyoA1GrZw5ZU3Mq5xWYoYg4Z0xqZt4FAusyLG bhBTo1cLMdgMBaDk0OsxtBtbrjV4xYoTCr42PoFtAnjclNYNaw+hzmKkoboHsWyMRFyV8ZFtlk6s qi9qOBvYHve0oqOEAIPTMacr5JTUeHtmpaTyfoQoOjOdKQRoK4Z8nFWAYMHduykN+ZOwK94m4k4N lkdbGh5gBMBeH1vROuTCovJm5OmBKYOm4sr9ZgNXrTws5DgP1/cuCIS4yJDfxR5emgxfAYMw6B+V 51ZAjkw8miOBu3fb40g1w1kds25dBgFZrRvY52tPVWXOFwjZG+hxO2lOPSZvvOviH4uqSPnM1fH4 ws4qWoqR1csm32uiwAxGUF+ycZdkt9pa4cM5DYfueT9lQmw0EtfI1WrESiKQ+P4WsIXkpElgSwmK x/XbmLNs7ossNop2TC9MXSScAlEegO3dM7mvCoL52sqR4aSqm0yMoXB1MpcLzUAsCdXQIYDHISg5 h7ra4pEANyy03hYRmPibhNtgxB2z1BguhAfxj2IIvVQSsgB1LGkp4yeBILirkuoJiSFqFDPqNZwu yN2bCiuAMQOSiocTsIhrxmthobwDCqw7i/SiFgieIpiqBigUyxnzTqLgDglGkSyUNfew6blqrpEh 7kPmdrxbjGw7pbQEsSFOjWrgkQRBFyuc9nZ8Zr62iPcn37BXRnB3jGUP07eptJUiItStEAoc9ljv FNhtF10ukSoeNUJ2px2xVWAadCbIsFic/MgW5wVioscmVhyXIt70sCAw6bnD/F3JFOFCQvbnAgw=