# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20110502134439-\ # 7u9xtk23w6i5flfa # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: 691c58036abdea255ee196ea7ff01a3ceb4283b1 # timestamp: 2011-05-02 15:44:43 +0200 # source_branch: bzr+ssh://oaske@bk-internal.mysql.com/bzrroot/server\ # /mysql-5.1-telco-7.0/ # base_revision_id: jonas@mysql.com-20110429092356-iriwp3151sl2sw65 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRy0YOMACyz/gHQwRgB7//// f/f+4P////5gED3zsaSQ6xdaiaapCW2VsZUBfWqHWhUdbt0DkUus7YAuGqaT1A0aDRkAGgB6gAAA AAAAAJKE0TMqe0mpp6p+qYnlMg9T1Dan6o0xAGgAAANqZDjQ0DRpkaaNMgMTBAADQGgNMgMCZAkR EBNTBE8JkapP00BTbRGk9T1MIae1Q0NDT1MmjaQbUlT01NPImT09KaNGI0yA9QaAAAAAAAAVJEEC YTQTCNGjKaYIU8pnoak9Roeo9R6gPUGjyi872gNyPr9we4XfI5I6kB2DYXC9gmB/AQwT1DUTSmRM VVKpCo/FDCTIT1J4NB+hP/E1pgYP9U0pdNifvEyTJ7hRQaLmwazDsylRZv06KXGxLMOJiH3vNYHT Io1ocsW0QZM22auLHWnD8/H3T6Iy1X+pl7zL4k01p3jW7qgVUlp8UAa/kyr68rOWbi0xjUX0twCQ ArajhxzroBZZY+uuc4FczwtfOLjFtF0JprXzjZfnkFu97SR7OnbIhM0SpW2kw/l3+qqh/JQspZWh eRrSlBMTBngFgjkHlDcDG20Ntip70jGluzVO9mxq3MtlGQpinXfM1iJdd90lIgLph2RY1hgPR9wO ojrJRRKJ5nW4YgnL3d32an5gmSGSH/SUmkHZ+nJbRs/X0/C7ekzJ5SffDDcCDjcY08h9/mhB2n47 bNFDTod2jnQpDL8dewVDQnzeLVnArzgtRfTNMUIvMFRZ0wXkTTY2NiXkNUhUmKYqVWJN+vQ4+s3c +vbtVKzvEbZOq8tgesnrJ7SbyYcevrLThWrFz7uByYuNodDbtpua5FVtybNGqPLia5jl9dIce4mo hoEZEsTAlxclyXLkuS5LjRDCxyaAAKtappMQioqoV6DiFRQAIeUmAhlZEw8BMRh8MEjPjy6/M39g x32fKg6HqeVzdOo2KcR56u4qWei0tkVHO5A0gP6wIzkppuBh6TieiSomJiYMGDrfvmJf+JC0r/vr Ks9XmIVSBLNIKZ9GYhUE2DSIKOlrvxI7/PkhUf0+qLDvqfp6UHs3IkehOxO/w0ft0Xq97+fifGfR pUhofMrh7idvabbLWwHTGUN1cQ2edybrmGqff3nmfGV3xg2lPxALDHbPsEiPZrVQ4CxKOol0NQUh gCoFAHA2SECGMNI5bBsbrI8w7l0Sol2aYLLoWm1JKPT09/endqqZdGk4CZzPzXiXPMENInjYApgB SAuhoWtRuuR3XQrGhEEJoeBgWgq1QVq0mqwCr8gbaFtvDAihMstVbK32hKrpuMyU4qOz9d5xMLMY 9og3i7hN3znOYJ+QWk12x34pjL6awwIcugsh0UiTPfsE5WqUsm6f48uWWCHY4+TCI2mJ9DgfO2Ix VNfcTLI1zLtmE1c7dgFUnl4rh0Rieocr7t29qc7lNs19Pn6U7VDDNnnS7r0bmDg8PI5cHv5ztSDd w5ji2Ozhyu5y2mpNPJx8161YkwlSQrW0OLAXVSylusSa1lxjZaGkoqkmr5wV8nK6Hncmt46p7Wdp 1aJOUJsp6Od2PbzvPMk5Uv1bNfPkFzKYStTBBspoNVmctsJLOCduBpeRYCo9Bcs9ebowZKvZUTGY tzaSO3Fg3tGvdXFy9bHcolmka07ksY3Jt68LpyURab501OObDPd14rCRWRSYNdLQWBiBNVVpoVh0 zUiDpuNK0z2VxfLJGkBElA52c3wOPlNRurdrz65iNW24sBTFg9cB1HYYEh0dGzLI8JlwOOYIwxVR 5KzSX2YXlxtLBlhmHGw7AU8d45vxFzcPBFzxnmOlRaZ6FpqGZNzNbMdLQ5Wn5Th45NitbXm1bufW nIY4sVaXc75m2k9OlzPodL38fncnPup00u89OiOMwx68/O7Mm61M6aKw3HQ1m3SLccV+jSCou0Fp xxds4czNvCCSyxV5B4/K6DWxca7sRKNNuXORJHRNo8BdaWV4pMbjveTnxy4y0YYKcebmz0szctTU z3sOPtrO7Ss52xJoLjsBR4hbPffrzwfgvGRllNZ4VT8GzS7K0VGURcwpIqxa4RTBK2583q+TREoa MO6Reb2+v0o4+b5yAHrokns1+3sLPRa1rVVV6C0ZPo+s8XuqTKQ6FcAavq+MWC+9AhgAvhzxaQ2x pt+8/lnuBHwKgFP6ePy8k9Ao6ih6BDAFyEv1OaXGkdWgWrGE1SGaf+wGum2tXJIW5kn1MMeTXN37 dImqEZ1Jhsl9sI29GEIpqsCZYZiYcMd+Oe1lu+LfIc/JzYpo1Qj9crM7ZYdMeJ2u5ePN6SjEH0iq oVULtE6jPYFyq26Fx2q1FxUKCsRf9YK6i+qoiswEEQJmAKRMYmJJgnvE1ifOhSUn1z4xUr9yZs0p kzLVRjTYwYpFApFIpFIpFIpFIpFIpS6YshRkmaXS6XS5Lpdcul0ul0uS6XS6WL3VRdLJdLpZpEkf 1iTuEpEUJRChKEpKUhSQUlIikpIUlIKRH5pSUlKSn5CyUlEsUlkpKUSyUlkpKKQufgo5UoR/GiZG EWSjZwR/9vb23E+pkfkEcrl08OKpJko/jUeWo+z+bxq27a90d38dqEdGzrrspB1FiBe7SC0FFXp+ 4eOQyMI5Bdn/JJMKMOh1dLHnsersBkCTCKz0+RKVTAyA/kYXiSNZqXYAYYvXfBW2OR3ndeIRnz+P v8ZvVS4639zbkw6n4+KPnQPybfYwOaOaru7vb5PypHZUExNeX9sI7FuF8yQMFqGI1m4+zfn40MIG bTndf+DQ2bCdRJPLqa2h0+xNDRKbltscm3e6PHtWX8OqENIdd+FlZ5hDgTo+o86kA4mc5B5byQRl 1z+DodBllakHizIgTpYSKooIExgpEmYNJDEhwAmJ7xdd+wk2XmotEy+4WxU8FtqCVwEC2kCVTjvN Oh3HfaC0NB5N3gDuf5MoZaobuhEJqDaFESrrVJ1xKkFeKdiREWj1uq3LmyEZ5kp9pgYTR2Fkqp15 jMUC5iQbsT7T5rsazydrzdzzL68jmOYN+M56VkG2SsHk5trjierRfwOgCYrhagXbw2LZmSCsqdFu Hm35eHwuLtmp2aAFiNaQQPLznLDJv5Y0dSBTF6X0MVcNaXKxsE0iUEmmA4MGl5tykSKoX7wWV4Gl lNz65RImKr68sUeEWjO4hGc5rkCQolImDklxkHlJlD1+gnYho6BPCI2SpKo970PFxZO+oxlDUkUf j18js6jtxOLRfsPLXSi3pI+AU3A9g9CcxPU72ExwsmROSIYYz6u6W4w+HifB4Tehlzzq2yaKs/Xb knX71PVHzQsot6F7o+Pa13YZdN0sdFpC3uT5SsvthUlSrfd80G3Qw60O0CJWmV1Ity26M0OUqAWI K8FaGiibSYSvk6JE6zttiU4w9SG+VvSNxGHerOTb5ElqEzJYlhA2EDQlnZ8dPQlroK3Tfz7dHQK7 C/ujtfn+LK03AXVyWK5izj0qNmboHcJGZHOuXNIKtO9uGS/JaAWG2JSFJUOiVFVVKohYlSZTjkTh bylikJKORaCRGIfPVlhlUIrq3gqJUC4wQ3hcpVQL8F4jj2Bb8KLMqi1bg7wsuUlRUlzQJ0yTySlK qiilM5OZMngTiwydjLAzptrepbYnFhfa2nVhxwiHh3+F/M8H7ff+3NxeqdV608xYdjnMu/rZ9D2N GnTGkaWr5YfpOZoTNo5F7xPZQnJRK/OiwSiFRlCxLLFqMAptp4pWFUYyFSonIWltunElClwkghKF 8vyjZrO6+AqhFoJl5ck+qBUYtGIvbNjuSvEcSw+qvXaozIRA0iExIa9NnXl8Dcnp5sdDyMenTNwP x+4gds6nVFFvr2tCFJGjZREqToaZ4cnyyzjQlK5Y/fSecKk45WtMvdeUNI6o/tSZ22c7+HDEnTo9 rNN6ff3suAcF4cLm9pvlEpv3ujTY6JXI2gtQzkhR6DZ9pNEnHQOn+jb9qb8V9tQ0FKSpDobSbIan 8F8ow3F5HNS2Fprv8VYlRgdqWCopJiD9XlQp5OovWVz8KC1iyBMVApikgwu0auChFVUbkxOyHTiL AdarRBSuCDa7RRiQaDUZhcRRi6oO3QRRUCVBIIHl9lfzOmrsiIpyHqqL6XUlsprbtLvY2b5zH1Kb PHX1k5yY27PPEo0V1F5Exa5Nit0mJz8A8Zk4Uafs3/QbZ2G6lV4YIM4amwkCJI0nAr0LQoASkUE0 7GJXszx6soGlkdQIJQf6QM+awQc91pcWExHM5Ep2JvCakPUsRRKCij+xIMEsTDBYSihgE5WKXJjJ QYqFlixiSMEsTBKIuI1Nnw36yyGqcjGPcORgXSwkjbyJshZ9vvv66wimxm1pODZuYydm/CJ1o82k 5016t4/vSlKUUmDnEkYi3JGu7003e5hbfb3PKtp/DlJpN6Hk0zBLyRaQ08Vk29XBOgdDJ8ScPCa/ am6zPF57/TxWwr2/ARfAonuYfT1ur1zLomD593tcvSMXx4aZwmZNDv9NhuqKyS3ZLJ3SuXX1TzbW x+Djq1OCCgL+guMi2ct6ZB8VBSjQuvoEqC2i5rjW95oRZTdx+LU4a5n/F3JFOFCQHLRg4w==