# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@oracle.com-20101020011011-rhpmr9ee9fhim9tr # target_branch: file:///Users/mz/mysql/ndb-7.1-ndbtypes/ # testament_sha1: 98cb34d2934ce0b04fae8399856309129ce4bdfe # timestamp: 2010-10-19 18:10:18 -0700 # base_revision_id: martin.zaun@oracle.com-20101019231444-\ # pwpzhu4sz7x2bs97 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZoptosAAZTfgBgceGP/93Mn Blq/7//xUAPNSwbeh205wwkomkwqfpgkn4VP9IBJoekep6jTymyntU0PUBkUaDCamnpohlPU9SNN BpoAAyB6gMggpo0yNQPSZMIANABo0AA5hMAmAEwmE0wAACZNNAwklBNPRNQ9TwKekaPTUzSAAAAN NIVWqH5Gc+pxvsjXtzMkcy1OggAZA173QP71SglT1Jj4G3u2URBr1D3ebaGOF2aNzUiIi6vyp21u rX90JJAMJje6maKbcmsRagkNWGayY64oLetNOEdJfLnLb7FCK97c1sGBGa8buesEZTaB3tTcydET voaUsJAUk11gqqEBRhEnkjB3CgQOe2QnKGPe/uKkUTU6Zk8FBAUW9qDYYUQITYI6lkh0eFncOxXl UqvTLtLy6LbNY6t86oxEYTxUMEbq785bw8H2lUIEK6EHAuHGpkhVNRvoAV39NwkMRkIYqVrClr/K x1/Lm5swRapmLwUCZuDmGkyRV3C9jMkaBQFCBw5ng1BMTri2niX0pFKhm+Ojwzw60CIEQdYwuuea 5R/ktbMdI4trfPp6qInYRb0oIf4uD+S0yNgYOjcLk0DhdVG8WbbrXMGhsPBgYfQcRfeF7ANANdjA 6QbrXRmvsjSetIEbCmClIo4kBGSdRXvmk02wMMPGmFIxSliBh1b5IKzVkD086WjP5A04rz9G1imY NH2JdAhzjX+JPEv6Iqy06WQ2HtAPp4NvizfvZtPhr5bhFs8hO5HQj4VVQ8Kpka5wTWdqxH03R/Jg 1Ha0dB5llbHJ3xC43RyxYt4c5S65l2RsQ0Q7mIk2WmhP+tejlyNlH9toUaY5MF/mVeu+hy7KvJ+B yzEtkCp7vU1Ie9ZTBlHSEhLp850IxbO9sRpbljR4UFEK98wodUsgy9NmmxAKptwS/mozLB+Chsxm /tq0hNTonEOIcnoFKraxr36IC82i0pHnF5ELZfnkC4jxqiFaIxvdlNQnmslYx4SxwRCuFgqVTp9h n2xXMm/PFMiqRrU6uFAVtQwjI6oIgmg2ZaoK0ThdWP47MGtOqU07gQkO+FkajZ8OM4YhDHBSO3eK zeyOzzoJBNt1ryPoZcWc1NMYrjuOMG144EVEQEJSEVgQtc3InuPUKkoO2ZHJQoqisCEQoXYRhZfd oWEjHMhFjAT6QRlBUyUubhob5IhSsUhmoGwNPgOFsmoe4yiPWLdwhyU5HcDSSZsVikcoa4CILWWF XW0rQLSQzaQU0jsQwNsqBcXv45gLWOxNdk4tuRwDlWeYu8Zwp3qkgyhbsR0UwweEJFgNp84KUIZz OOpyf29Q1iSIP7oAUZA5syhWpRGIxJnlEc9YTkKk1CHyRXk0mbD/F3JFOFCQmim2iw==