# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@oracle.com-20101130044643-1roji9czbd6md82s # target_branch: file:///home/cpowers/work/dev/base_mysql-5.1-bugteam/ # testament_sha1: a3cb2a5f95da921f91cd07bac2e580bbc88de1d4 # timestamp: 2010-11-29 23:35:34 -0600 # base_revision_id: georgi.kodinov@oracle.com-20101129153622-\ # r803cif0yke00bi6 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWX80spUACVh/iVxwgAF89/// /+f/7v////4AAoAA4BNi+PHu251R7z2+vL3d92Au7vrVNKnvEvTedGn25e89br3OnbLveq72jqq6 2rGRoL3drdt4SSIJlNNqbRqm01PUegE2JingmUZGRoMg0yaNAGgEkiNTwmlMUe0mUbUaZAAADQAG gAAAAEoTQKZNU/UntUyep+qD1PUaAPUAyaAAAAAAAEiISPSIGhppT2k001PUzUNqeo00PUaaaNBo 000ADQ0BFIqep6YmhqZqnmqaYJ6aNKeKMTaJkAMgaBoADTQEkQmmgBNBMJkTRGGpM9Kn6Kep6m1G mRgTQ00AG0JFrDI9bCV7W0m9WPnSed7ZIOg4TgxqpUHV405ZjEcQ807xevc/OYa2+5mO4x8/HTnf DCU9LC7LBWc4Y7GdaxOvmub8XV19Mv1+M5qndq52d26P3Fdr0PaihrGfs2qUsTyPN4u0p8Wm6LU2 ML6MxPL13/bj/X9E4CgxVlsxzdG0tjLiyLVWridY1JiL5X32rjEsPL36ogeZ217ynhaZMsgYs+p0 iRHofbEh2YxfG8kSLegM0Zr0mkBL5rcyr1u+jbNG6sVWVEvXrXFq3lUPTKF/S+/1e8ELObgkySWm yWR7kkrTdrrWbxBKZ/UryT+/AG+dKmHAyxlzdnnF/Z7YXBgNjYDY3jhjHUka+xuZLDlxwuJa1ug5 wS495RQnTWbV7HRNussS6MhrBmOeKOuWxJlmLReSiz3+zth1C187Yo/FOswZkgIMelRU0hWbAwmE fOIodMfLZ+w8F2hanjY7TYItWBxBjbV1RrCV23eYy4Qer5qb/eLmouiA0iPxJSxBjAzEGwEhlM3N BgjMLQ43M2DfFpcfcYdxxQW+IbQyORehiVlfA95YSCIROI5zYIrmmN5YbraFSZMiarCtlXjNi+uC cYxeo4SLBQPrClqNxFX1R5Yk8aVmcsEwORhKieKSvHF6/GXLg1qznVnSg8xbkDcT/97GPHkZnpTN ZHoLCBSQZGiJ0biN6ziO23hOoqEFpIGorvgsJDkMDQKMWMVkYlKaWnuK7E158S1WkiVpx5lx8xmm HCjDlFVBOZq4/IDEwyBSIHHAvXX9uVWpIY4GJYSYsJB4lo8VSuCoRKhgghmgMM+cp+XPILVO6xWk EUNiu8No7kq18GbNiywlTJyeZ6NeBjVZs0wrfBLQ+nPbQtek9PQLQBDTBNsbTG222222NpttjG22 +SF03R6VnxJqjhpNYczQyjM/qJKAUa6ltuaRH8ny13ogVm3rUaAx2xdZbefLVrXaLewzLHKVuEpA NhF3GlaQnIcUEtXUGG5m0DaK+54QuBZYOYPKFQHhQlgUmXRVZInvciCdWGHnkRzu8AZEOVe0EAG3 wnIpcBsVqBkfmfcq9SQDlNHkVJGTBhVSZPKi0g4ZE46FkFopqBBS5q9XSNp7DgH3SDIW9lGutbTx EZB8vr+hHcq0IkPPbTr0CdhzQH3WxwgnUAd5edD4jAwMR2+NboX/a3KYRYxiivMKctlNSGUxkEIb k4YdFfGSPt+70UDaQqNB2mvha5GiI5rFJ4XbMKjNNQ7GoZUkMYgSim9s6KY6CTUwA1KMhjpyE5Am 8iI2TQBxupkSUwcZCMPtxfIsVgoMqQhKEBqOWaZJKiay1UybwCVcSktqZrD54xjlK+OgYijJHZuY ydPX1uCuQeRcBWC/RFcVaVvaencqElw5FNIqD9DX38jd3HK+x/3urmBDXY123bIKYm+lfvM7FLvy Mo9tjQgCLE+p1zyNPMBiYRHHGz0kY2LFYKAq1X6d5junSDlZ2Wl1nhs6S9VngmiNRupYLx3mIbha HVwVVdoB3SP/zelmNF7Hfwitsk8axb2VjJCiuvQfhT/6b5u9qpeFzLaryYsInCRHjQ8DDXnWrpnQ jiRwJSZi+RK5FtulVWOAomdCgc7aoIH7i9bTYtD+xanC8kvJfC3MA3LQYxnhDQAYNDHUEWiE1pqU pUqMbQsEGg3lUYs5uGSlQbhyO0oPH6hptM7bqIaUNcG8dzmqMpeboYRnL3GbWKkoZ8MBp5cVCSeX FmEi4vJ04a2jg6l4iSyHATPYPmK4M9YG8gtoEDGuJCJsGUGVADUqBzAk05ghoytUc66SqAOXLiUI zI5BhiU7GhiEN6VY5cWTJKa8NtqMVirzAYnRzdhexsL1MwitDLSftUV2sgzwWchWhMwUbquJC2sY 95jJyB7yNZEYjqseZw33xmxnxVRQkSs2qpbVZVq2b3tfjTM+MbBtULLdiBQmi0x5NROwVqxDmuAH D1gNQg46hqQ3MZF42xpETPOy1myJmGOBgbmA8VQtJzoVq09gxeOxiWgHkcPwW28anDG57alBHFTL ZUSYqTlt0kZkwhAkpR89CVws317QuDTbq5e8rMCxaHYyGXVadoHeuiZTsq0bOOrLftlJ4z2wFieK cnwbQAoVHBWHYqwxiSvwqshwt24d8zsYjmhM75j15YTWa3EYOqyGFTKpGjKkrx9F15oLLEmHSHKJ YXK+ZtbWL6/S3EKU6AHA68vci7kHNMrSwO7B8Rg6OLxdM8r8HXEN7VgapWjoOiLSklgAwNFmVEdm GkgTot+1qNzwcGDrs2z0RJjy01d4eTISyDl5IVZMhY4PCk0v12NLLmOoIY164sykGIZ4z5RZ/KPR shDJYR5NYa0CyXfwBPlED8YRHUDmA8/q8w2h1qVEoD0iF6vbZiWJ93vSWxu4UhYIj5z42FBK8Z14 /NPOiRjGHzVzhXEDohoWKvBAwJPS4AwVCAhysyjIJSeZW85CuaD0MlGgTEbJEEKEtsHJITBANUeA YBIQNCu9QDNpdDorvxWA6qAS0zCWDaBRBFQDLCAlGQ5+i9wJ4IHgsl3qJJYhHz3rNJKYOKBN4bv4 PRJE4AzDhdfYDdX/YMxMYRNG9+ECoPWDQHQ/bxT0apYD/g631wA3A74yFNgglKlMhy8wmkSCN8Ag OJhyCKiPKdg/gsckwvgysmMxkBjcC4qpxGAJgYUwmojwQRYoiPKVQjjykRS6iHonTCIJLyQFDgbY rAUZiWoUyCTGEy1tZY2BqpKyBBwBF0M3swFiJX6C0KBaMeJpZELTMcYTAwoKQQPoKA5qGYKyIImI oNBH2cgcZhgl6luCJBVgq09Zgk20W0v6wCQw0gVBC5iTBoBiYw2BgQMKLgQ0C2xZsqkRnm5YFcSR EVVtEjdWKrfjHcGIyliHZXXlsaCgRiEmCIKsFIF3ioJg+ngfuP6fMWtYuma2cMOgtRQRiVkGEOEP DJLVhE6TUF1oaJefGZ+VYwIWO+JoTVYH5JSwQwPnmodeXWArJ94GELrzqIHlTCn3WN3wON1eEmcF dxT8pWvjN09MhLXBgGNc1PIVKaD2NroRpNJFObzRvNKqgigyHnBlmTZS4I3tWUnQlWTfGe4oTTDz maiWuhkUhoIKb8m9XnXkRhKSR6EuDEJHABoKhtBmwArAleQBzkvyVFwcZwBeHYhHwIGxSwy65EYj F5WWi1vDz14l0DAPEApMY2FRUiiEvIZNzUyNdGSBSLKLjsKkTRGZAnEG2mWi6WS4VaziiyXIS0e1 h5nI6FYx+XYIzIjLEOw3IuNDxMBlgbj9spSK4lLHgns6q1XxnnWB4fXvtBkISy4ZolmMPQ1vvdAW MAHlZfbgYOBKHoOpcQBKoDGwQwJkhO11SgeIZGYgHmOY14cZpOQqOgkWhQvAeAPuOQ1AOKAQoWBB Cg5LSo5lNN6eWpgjE3mJ0ORArClwIMf9MU5clVQJ+43KqROpxU0WINyO74xHHGF8Q/djAJCinRy0 GcaIoKLAmS2tcBIUMCMCRlSkpNkORmSbjkkMvmYZkIzkhxXKfuj8G9y2mhy8u6Nk7amsgKpyIVkg tX4hdhZ4aMKY5uKxFyCg4RNawQ8AJDedRadZwKuBUlJpFrsItlOau5BoYVNrxMaaEttc5z8s6TGs O6vxkmgopGZ2tg479pv3PWvVQ8ddRcRy4D7xhw3s0eBFTBgMUwHMKDmhzLJBrNa4d9jggwD0VCPI OqPJdwyiV+3cO4w6kxEtKQmBweHNg0Bnuri1dhhq4GR3O6ZEqCTQAIZxTWvoIK0IBlotweCcBfEt NJAnW1JEjyzDDmTjcBPVKdYS6XCW643i2rZCFRwxymnpKDLStNK+k4ySPh7IhliafKaANGmR1UhK cAt1+KYTgcDIKYwXlQtBkWW+5ywJRokcZHTmBsIEIh2utlMdjrfYYDakGOTIGsKAlqkO8rAaaZ4a 0z1Lam7c+LUUAKesXJi+GEHIZg3V6ymiS3oqhB4BpaZRDGdQ+asd9bSqpoFkkq1ysEdy7LfUgPxy MqjTxSQ13fIHMz4KXYA5yTlt5XM624rWzg3kBMnSRKEgcvhYS4dq0M1lTAMRo3rYuSvBZjJIvIMU B17CK6IIjnJ/fsc9zbgMAtGC6Bt/RIguPqcFqGasFbMf4Tx/FIDxZkmbiizEowxkgNCJJB5xb2ma XwVZ4bw9C8W+B7TpZY+ah2AE3ttDxrdFT4O5uu21y2Yhoc/Mh0vdDJeRuTl5iKIea92KVXJSXzTA 3nHeSXi1wIvHGMDEEKxEEGdEkNpAsw6TcGR24deMoMr1Y5i+S4K4rdRN01Uc52SALES48UbFh47F nWsbqpI0mWcy/VyOoMSZix4gCse/zuyssS/C4fYU7n1WC0ZGzYCnalI0+XouMg+JsRMU8aEGLmpM kkik7RBJBNBamlSaMNlM6akJYJ/QEzUXr9q9FMkq9XC2ARTJkDsPhsEoXMgne4iXXIN72eLELYUA XNhFQVYNsnd3HFA5VyhJASwGZC6hFSD2lfupJc/KJGpjGtBXaiAzYTmw5i7KVDtLQox0Bg8JsaAD r6AAvaUw7r2U0jlqgMFYT3akEjGmDbYI8CERQSZaLuBkQzGPepLgmVxyN4DvwJhvRipBXMMHEfqt QGpzMhtKUtEHUj62EwLyUkuJUaJdF8HV95MwRzVw/zoDFeBn4Kua1TGkJK0scIKA8OFxzW+MyFrN 0C9jCWdpz2rlqiLyJSICAYCUgIIQ8DPrYdTme47rTwSFa6QEvSDphhs/M8zAV4MLxFjfTkpKJYnA xJLFJmAc+XQAkGq6YwSrQUC5fSQuZeS+wJ6kRg1EG+9Tl7Lkc69iBYAd9CnyAOBlGpCTXK3snQgg GYjQEDeWwSgldCsYjs7ZlhrJbJghzsJkCaoOVEXKJdy+f1xqQEhfUURegIkqOeKDJZyyRjdmX8zu Dm1SII72LEj0gt95igkK9ZC+hixZXLcDFoyuFc17u7u7u8V5A7HhGKlFFaDDmD7GEnIisJWIHPi1 sXWZWAeanYvYqhcNvfXuimGgpjKImDmZdIcytOqExiA8kiFPErvJlTbYplBMI+k3A3hgRsGZDoqG WyneSE9VuBOLRPGkIOmxo3tqtUGCQDDyOYoOKgFuYUmPKcGQM29vue5rSAGOdtXGG4I097ux+DAB s9tTzXHQ5kjcaDhyGYZ+qtQrBgUUKxUUU97FDC6wB9uI2Fsy4U1E5q4/rGFd4FYlM4e9wChyUUQU cNAkVKWqsCSMBd+46lnqRus+8+Qo092ealN5zbsyCGCTkfE9jX7HTe7OMrBzWaVKzoaGjC522MGj paoIGjAtAGCoSdkKjkqLgnuKj4rsOgWopbR3WA8WtPvSJf0L+1WP00vEVN6mcfI5zabXlvALl13t mhw70H9QS/0QP8ID7oRkQwsXT/xdyRThQkH80spU