# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20110107162019-6iiew7yxxgk65ccc # target_branch: file:///Users/malff/BZR_TREE/mysql-trunk-wl5379/ # testament_sha1: 033ff4361d8f3627279f9b10a11972439f87fd08 # timestamp: 2011-01-07 17:20:38 +0100 # source_branch: file:///Users/malff/BZR_TREE/mysql-trunk/ # base_revision_id: marc.alff@oracle.com-20110106154643-\ # 5uv9lbp55wrnmdvc # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXZFDmoAGhX/gFQQAIH5//// f///6r////tgKD73pV6znMz6engnbvd71Hu69et1G973s29nY2889o63boqCgUqRQMbe6jqHumHe 416Gx6527FQUE7uFhnITsyABUQqJW63QiVVu3daSx2cVFwhMysbIsONDQNGmRpo0yAxMEAANAaA0 yAwJkCU0ICBARTynqJkMJp6RoABoAaDQANAEgkgSRlJo/UQZGh+pAYgDJoGgDIZDQACTSlPRTGiT 1Sfqnpsmpkm9KeptRpsoMgaA0AADRoARJEIAEAT1NANGVT9NSfqntEeIpnlEyPU/Uhpo/VMagFSR AgTBNExNNMgmqn7VPJ6FT2mUE09IPT1TGjUaekw1MlEHl/f/75QZBnhoTpGKdcBxPZDeWRygcj8e CTw8Pe4e8bSfUDY28m3LAItQJ0ZlF5X9b4Pi7d3l5QG2tyS5V3nlk6nREku3mDwBf9K4oosfAlNM CgJSwS+Gn7M5c5rAxWklOoFFE9RksM8SgUDDpyxRwFAwDbEWoOKbJmwGvqID4RdgM4OWPhYsw6S3 O4oIiGwFEmG46jkHMnzFk5bwOZReqc9ut/MebLoJdMlRhzYlVYaxualeE0kPl7uaG5UOGFYEUZnL 5+coJOKsP/ws6Xicd6FTgWt2IpEEOA4NVLBRtttjTaqqgqgq8EVQ0AxNDbsFVSTTRUFYyPPbj39n u8dj3OiXWF0Os/wURRDd3RNOSh4o2MZn7MY1OMS/s7Jmkxx6bzDyVz2rJXp8tImyCZtFJjHRAk26 qqilxg3jeXiHIjIYOetxA3pxZs4pDmTSEJCbNZStA1JtFHoVYwRbnS1iU9XpbGzx6Ussv611skkk kkkkoqqKv0YTHadEWKTTTRVVVVVVVVVVVVaAHZ/sQFkPAGRDyI0jxzSSaapkYEWMVgQkwUEbgQQR yiCjAVGCwYkAAkRGqhHYqISeo8WoY2JXEM0+6y+MPOOX9EIbbhz4IsNnuNhqj+ozhE+H7/y+fzwL H1zAmYgQ31EiDqjX8h78BN85wvB/7r87paWhcK2xZlZjwFXcttpbbRJ77IDYNwmRC5A6Ctf/nsbB GBBIAvrVnjHzDBCEGRUkJAkUfW8Oo3B2WIH1FDj6e71Hwepeqsrf1Usre7QCoHxfHidEywa6REw6 e8Z11XAcBlhq4vnH1LG+9feYPMCvHJU0U6THEvFN33veN7CmB7uGMKQciqairw1LJRNYfK5Vkpmk pjCUrNtL1SmXYveIdNcWhkNIGLCHisNotBQrUKUnAihe8eAjKtlxsgszNHvpixZVuPpJNRM0wvRb sX8UOx7EhuDusFHePAuEE5z6FL3lueAdnahYstEE+2LihHibT+JklxuOtQzfvT8MctVfzX92afK5 vTXM16/syXvv+CS5AaJx/BCXEganp686+PuH9s+riOcwkSUcRDkFjmsmNtt26pGjANLWYYNsxpzN aYZyIIkWYTJaWNSlpYhg7j5z7xOhOinGOW5e/r/fsYHAzZL9b/SxkdvyXQu/f/Q4Fy5TyEfaMaGC 8K5kLKeQPxyLXT0cBLCKXPsDWMFc9QsN/smrVxn7TtCiHPRmW+6Ed2fC+T/Pfllw4k2ZisDQS47T rGwYumldOI4tiOzX4xsiG5hSofrGyRwklIUSEZYD4xyPUCICJQVDgSUgh0NAhjSh1my7ccSFz2+x gvdJM5Q8gggg4YPvb87BYHY4diaL4F2bGb6HaY1XNEuTNavFSCbbTbPkgwCJXwh4itkWm7s/OSWz 5Nsf5OjkilPve1u3GySVsjuQib/WQKNkkoHgQLp4zUPQsNxY8etboaNweyHRNCpt6bVk1G/K61sK 9rj/PyqqrB6uqAh4jz7m4Va+Y8QiZNDaeKGJ1lNsilMMZ0X4JrcJxl1bNHJJNklje2u9Oh0PYahc 5ob6XtnOuvyRy5Z8cjbXNm2QReo3DDI6ljuS0kYchqSRuzjVpvSk29Eax+2wvDBhPb4gUFgoKCyL IpjbtyW8jpyPUct50OhDQKfFEgJUuJ91K9APx9/xnx+77rlyfD2ncfHndcMVXt4qxVTsd0k37pJw xx83z+R56Y9Hfy4dPIg1AHkIrAhBgj809jaledTyBACFlqSCyC5x4+KSkDxFXHwPkFhE3IeYIFjK XSSSQcLhkmDEufo72y52Jgl5WFFUWllzI0aIs9zlSmlWvH7DF4liOQ5BrugUM57d2CPE+1CEgoSH zxEDNy97kPHQL2CBFhzI9Xp7tCYsK7NuA/vn0j0ya4CgoIwMJ1oezbQ0C5z07NqBmarCBiS6sB1n v8KFgvEmMGU4PJauIYA+jpJJDQIIavl/liLUo6YNUEk0u6uBSvi6cTu6Rs7u7pDp8hgzV29a2XJA gv69/PFDgGuKWG+KkxSVJtx5cbtcI4aqKKkzGc6PvVPcQiEGRCCSJEgwYwJQlBHqjyUlKQiolJA7 Ym9vhNgr1YuAW2h0PMevTcZ0peRD3/D3O/0WH5k3w+M5ny/LiGeElh4dp1BtnnDu7ZWKovSw9qgP c8D2Pa+bx+H1a2FFqUrb6LM3UmLTS7qKTT4WZtCp8wPhqUsf2C0TBgsg4H3Tc8UFjrjCDmrrsWh9 lVUspN1EY+2SOx1vug1nlpc3VgjvONjd6ZGXZvcHBUlG3bLUofJUl/IvQUs0DxxjYY+FMzz8IVe5 qrherSazMC5UBDdxuPF92ZjyZgau3v75pzcqutnRdM/ahJbQGiDGDSBbSXdqPfJqG41d9iS2gMmW I2eVwYcwN0LvQaGbgmGCIDissb4JYjUtAwclUdSfwIQj6gIqRQiJBiidp2naW7Tf08NqvSpDlwki d/4PlaJ8vO3nW4lUjCj20RjQmahhQW0laV3ypi9Qa4NUM2KGkkYMjBsHobWrC7JiywiSWhFQSrIV JFoMllkGTN+GeEZu48rbNyYtqzgybF9e3VKmOxjdIZs+CzU2atijezyYqg1a8s0ihR8ogg3CzAUZ 2bQNTHBoYNMEt7xXYqVFpRacWj2a33HM/2j/go18v3Sbtt+cSNtItTF13WAPwhmRePJlHdrTM3Ej 0dYkzbo92JYY0gRgsKQSlT9eotZBJ2nP/DLPryA2EhGmz+F9hUG7VMstm36Z6ZRFkjVxOxo71tnc av0xXt52WJ5emm/pvanW2R79+OmKbjFAqBQQeJQz5pN0Gi9HGDr6cmDkyrVWyczU/aaOrVvLpFkG rNm19TWjVfIyWtV/nbe5Pn5dbXv3INm1uU47SlG2SdnezcnL5wWc1NbfvevYeZoG/tB5jcmG65cZ +Vktr6xEbhNjA2jlAWMtdi7bUmaRKFQjKDRBrOW9zYpDBA9LyqGvszUKezyB+zKnMPY8ilAohBQH ZzXhgMlzNRQHM6hLYJduQuBGdKJ3IPZ9suENRMLu6q55GDQzLJPd9kDnA+avjv0JJlHXLt50uwFR g1bsdTI52igiNypqbhkt0D4A/6eAfEefnm4mXbtHHCetHrs/VyXJHwmoFQkk1UclnZTTYyuZGZaq bC62dLFSdrs1NrqhcseUGVQkMGZMFB2IR5IRZ/RNVDLxF1aLrgQ+nIi3o5oQcG5sGhJ6xgqccvM5 HIOx7hg8NuTWR177UimadFSdIl6PiWAqFTPZhtFmpBzJYCCSYHBzcWqgQX0Op65SKXjjVtihxJ1N i4UbA7ASemzcVhEnck5kj7uDnfvQwcFdDIB0wGxqWKEm5sXLkGhQ0M9SpDm+zYya2bkzdx5Gs9Db yapnx2MJr7c+3PRTNCd79S0YCEeKJFepRrS3B64TpSQxUKL6AB3htbnI/SV1M2xxe27Hn5uaFLI4 cND3G8ihtPI2c2m/Xpx7251PSjFqQZvW7WK2tws9zq/DYjymW6chc2dMcCY44hJLdcTbrN6ctQoT csdCLXNy01d1iZykW62a6DXBvdSzrZrGys3b2/BBljw3fH1LMOmzL2sNrhu3WevlB5o483e62toP v4muqXiMBJ77AIOOjX1zRjXqtlAV85mYs9js6TjG++Q4MOMB0r2JR3NeKMbFg22gkjBV44DFp8jB qTN4drCqQbEQeF2Ak6GSpLW6MWLBg5vFGUuwaOLipuLo7UHuYY9DmQljdOnRTFY2kftsFK9aOWHc Kv2Oj4weFzQoPzN9Dc5t5muCknfg5a87b5gwEeOli49TdGlCTocipsQeArk+IiD3Tw4YCs7a6j85 2oUVuqv2tSsW7vazMBWDrUkrPByLjMYMHc2iQLnAa5PA8KnI0NRcLnsU2tyKWLo3JNTJwabCKWMZ kghtREli/csdkSWLkiNS1AqXDVuQht5Q6w63MjC+RurPobl3z+DguGOKn2YjxDwIUqmPFeTLTCo8 3JNOJkgclwDDGyBM0xUyAMhDHNLqpo9p2kYR/wYh2RDTGppkP/Q+dC0MKe6pNSl67VNeNp74tF4u bPu31vRmLMyGY72rZIkLruwZCAzZJxs1YaYScOXmXjdWq5wk62RZOoip8BgMB2wUkjHcfgZzLAXr AJt2aQ+Yusot+sKt79aabg6TMKaGZYuC2Q9oBFjOjOuSUAwyMIRkjCEIQ1D6virQ8nmEBoD0KD+k GhPyPvaIRfvD8/eC3fof6mJ8jE/qYn7AcDaWQKEN54RYLJJPyPoAQ+oP7cQNrscZGfZj/4pmH/5s uh/D+C0NkcuEVTrf6LC6bClqPD+oB0KfmmZwMXIHOaE5U/mmLquHSaEkHO8hsKT/MlJ3M4ngftaz FM3f63+zi5MhoGvZH+7SZJNzJjO9dJpE7asU8JznBf2Kf8GI4wl1SmDNbf+zYbYTVNJeOtoXNcfv TWkuvMrhw640drceDKR94Gj5a+kpEMD/X/P9/+zyZDxivkLnyMXSqkQ1tqXVFgHqP3eX4v+5daTq pepAd8rOEtggR/D8c7/Q42xbqRDSYJpRo5wnLGy0laeRZhMY2WkrT0AQYNNaHPWGI9c9g9Ux7IvP awXJRdkmTF6XRgwJ7V2bMlnWp5EkFST562ewl4wXXUl2wexaVFKhiiyfEl1km1Nx7WSzqjqNThiq lUqhVVSOfJZjMqSjqbHmvSKMX4H1Sj7x+4/UeiEIsjnbh7gsHcDqPqmp2bJahpHcSdDqEB3PkDg4 BBotPjiA5AfcP4nyhRNtjwAIP3i7ccW248zLbbbeAqqqxW26Xxzp7ZrYiXC7hbrGQTBtMSO46PRD ZGIIBRBFdm0g/VuAsE1WQTBtQIDcxglkPxurQukikcwUsJiGQlgTBiIFVEIwh2O4btP4t9d7b3TT 5ouRpDeqqiKiohNnZtChULC3SDEHCGDQ0hQ5daFRjQh9TftaGdhcqsgmDYeG7kWpRzVy5WkEVlYD hIOUklxyjmI7FFsIaQwYxl3iqSwu4beHQl72c9QcUAOkhRUZOhRYyDAkaLI4hQwgWVgjYiMIDcLh gN0kxqZWPHMg5rGoGBFWBoZCUJgolk1IUyiiirFFVQddcmuqzryQMyFgYQVRgYxJ10hFJDQQl4YK WoukwLF0qSsRrMmat1VQTSGROvnDkHQMGAdMlGjC0tpRlsjEk5HIAcADSA7gmGefz2hbJLbW7S2l tgW2hI3S24IPmJIPi3SXDX7z5H0MN6BCK/kbIXMUhzNyxcKLmZXHYfT93h82wbxOcId6EUVRYEgG x/A5Hinb7YST6jfDOiZ2tI5v5LD+3k2P8UXVwf4Op3JY6kKDaTfQh+CpdaHpu/u/y9EgiG4W3EQy HqT6qpEA0qDdT6+kdaHWMN4T+ZoEPOipuyIrnCKjfEQ3jwGwblLB10eJPlz1yE3GMSdZUQpRMoFW cJAwDUbBc6ohbFdhCCKVAE6P91XAIvaTnDG5MWdOF4Na0iWht5ybGLb9RrRpIfj6/X/E8ngvhdwe xiu+pR/mzeJoz0dbwZscDWrFT3rrPHYuzejW+tIamTtbWT+KzexfxcWTFm7W1izb1zaQZkEe8k3t x5n9bzm/5/o/SKkucE8lPcUfoukixxAnwFE8eKJ6wgFxTwTYh2IFBioOC0k2Oxn7H044PW1rPF4M Gjval3ixeLyYIt9rxGhdxieau0eD+hVKUqqv6OLk3ONNzi+3tUSKCipJ2oMOS+rt7bXnR2Ok9Oke bYskjqwyY72rmM5Ixepq5PrmOXqPA8vtgfAcaDqqSZ0iLYyJ5xNJLBRUhkK1nB2Hz6NGAmTE61B6 aWwxiyIwIKRIQg9znXETnQNYIM1BQdo1gQibZoAMME1hAjGowplSgUpBJFPHiwmczAUC1EsGYUAc SHeZPKeQ+EHqz6+z2NMMXk1Nbav2nli9Gt7mBy7vVo5we2zzWc4Ny6nBluctGVmHLbJJRaopHZFF rWqHDe4uTR35m1qdrc6Om9qZPUTxe/U2e9757H7sGrgtJIN1fYGxyYrsEyk7e5lnnke2ec+uJPQd QR7xVRFIwURjEBJgS8i1MWhE36CCNh+KfE9nnkzSQbGBEcg4D1IJlCI76j6pgYuhqC0UmjxO1F3K 4kjbcFygkUBjPMMYMO1MihWwG8EenCpswwOguMRTbz2sciEKFt1VdVQqSWeD5Hn63a6tmeLtyeaz ydbBnz4OqqVGFPNtXZNjWp7WkOvlOdbMFL3svK/CSWV5QeeO6T3XckygSIcszQEkVbBG6xQNgkwE L0MuqUA1HCDZxALYl0aKiFKpUSciYLMFCUDg0B6qiMOKMfg63Rkz8PsA1SbYksetzyVsoeSkmEKk u3NcPxbHh9XhnW/pozwVJ0V5MERx0nd0r1/ysyk5yQ2usefwoui8D1zs7lk6S/r9H4D6Qch/iEQO QDOu2RXQi0kYQaQNfkHfd6CynSNsvMFVQYYb+lYK/IwBNO7dN5gm8zmQzJznJKCcyIj8S0KWyW1X h8cGdrO7OGt5mtHFUJ8eTKTaMElkc3SQWQ1oLB1JmKlJUpKlQMgrBYJIIFUq9aGrDvICHJQa4NiD 6YP+gah+woivu8wZjlPb7e3T35HqPWbjuOex9jvNzJra16fc1eo3M2/f+pqYSE1vCU6znJzYvou5 MG5wcHB+pzcnRtDNOKw67tjReQmbvDzGUO89iT7YoLP5SSv1rp90kq9IqSVFU3Q6a/r/CMkpQ8Cn j7yyHyRCYIe9NTLijW6bB9fsVmkNXWidf9YskmpDQnzQdRaJvjnCULRkn7DinzSFMUxkT70h8fcS 0hZYtwKL3iVR/MDv56JiMJJDGF1RDtwwdQtA/PFD+kpmyWd5xtJDghwO4/XBvkDFx/I7/SFFRMA+ i0S1f8xh292KNpEadJJK0fuT0gZeKD6dn5HvWKLFlWsLWWLh+VN6H1oNiPimyRI8Xe3Q+nq2uYg9 GsHiIcrcSAZMoCRGNU0QIliy1H+JahQS23SeJNuzb7ImY0SJFipGFzaqdJEuQy1d/lyxXMnPXRRT ZV1aiDIT9BRQBBGTy+dVMQ8q+hHuDlMBCfyVKkEUSFZl64J2B57ndrAdRA5xYtEFookURPZPU9rm JeE+CZCJM4Zk3fF1BZGMkslJtJ9D6cHyLkH4GUHzhOo6rQeiDqSWhFQb6fJHG78bRtPmWQwGFHvJ aFC1HfsaQ0+2wcg6xiSIQIMRDtIgVE6j2U9xzDnlfvqYouoUbIkfWVKKCpIEVOAhguhHqaHnGBYi L0haSBIximKFFBFYsiO+kpCMUbKDBpXWZ7CWgEjBIAEVikSALIAYlJLKJMdcna2SR3TGqFMxsP1d UhNcMkTSdiNrrmDb28GqQ1Ka4Umz6rJ2AWznXtFDnQ0pwaH+1K0pIkAc5gmZbhpo3LplGMdVOsl2 6DxGSMbpWAoIFlIEyYL1e/4BT0QEoUUs+D25YjPrGCNC6GJQxRv1tUpMCmw2xjT4m6Q+4blEpBGi 60olUDQhZDV1tC5KkwqiN0C3zqqwkdT2yTAP6n5BStez1Bg9Qmh8TzIqbHWPWPJjCEeovKhJtp2t dtvejIxqDM0TZqDQ/A6mxM5UlVEriy155JZthdLNSzWxrBF6R4TcYl0jOUhsRGySUQ/E/a2SIayZ BaSkqRZCwbN599MB+lJAwyT0LmqgeZFz1iMKWgaRpKUduQ54doYu5yRfCJuDe2SE0ATFBSR2QohY YjIiaCoERSoF2BUQdBvqrP27+7zAXSCp48z5nzwxqRHqSHGN0iSlLBH0/TXzdM0OKf0m9gm13n0I juepsG2qkoZoig5E3DQSBCEFShQ/x3A0i2GY01s/1q5bImLKGBrJOyJQnF+ZeW+Miy4RgKD8VBgJ zHjUutg5dWA2dZ8jJ5fR/a5N5yTiLuMtP3JUgejwr6nHj2z0R3ZI6OgHtpWIEyAPxOHIReIHQepW cTDD0hnIewklSMBCWCA0GT7SFggiEPvGIGI5Ymx1FRQKzhyNyJR+uHXgHvDaVBzl0ebvwuPCh3WX UjCleLEPsDp850/NPtPjY8zQuVCPGkHlKhaVJVSFEIQSCSCCx9Nq21jLatrZLKJjafkVdJJgkxP0 heSDYmKbjElGv0HnL4KNKFIKZEBD5CRXUqGQvKNDW2tiQ+ZjJogqHOSn3/jSertwDjIms8PfDCH5 tvNDN4JVGE08U4o12+85As6RgpAigcETQaSSMgSTuVTQo/supiOTFkRmIGQTqMF8GsPZc0AeFUwj 2sy0XMlRMYYWO6dReqOKei6bmcDWQ+TULEYjEGIIMl4BhkiCE4JLIJBZBYYoKBuwBkHAICyAghDi bgzpKaF4yJialSwNXJhu0o5vqGGnNKDms9Jml7ARLdBTGKHiADSUOK0HVEwslillIZWKSn2J83W+ bvMrpmh2yTfzclHWksWKaPHGGT8kZ4BLkPHSHvwFr1RWkEwhIjDa0StoUliWptBqqrgRoHpLAIDS th8KByq9UN93p84cqIBw5dNhDTe4oFIuyKhNEFZIepdwQykMD0gtJYy6KpdYMPNkWfQhq7BygSL1 GhHYEHBYuvwYGQ3KRMSoqSmFxZTOKf1aIyRipFmjBfDGLSRkpJSiUo/WYnxg6Rixhma0LSNC9E1i UJaSYosSotISLEjYpCwOYVgg0sgMMCSARUVFVaIUFViqsIiqoiqryIHMCMh9AsVUbCTunYYIh6/W tVqtVYNa100DJ8lJJZrLJCxNSRJAogpJQ11Wq1Wq1Wq7twHPkbKREYwR1JbUBOQiWLKm3GsCKHh3 LXgyH4MEMnUXwXiEQzqtxXloPkd4mciBAwFSIEYbhpi8/NLFkkCQJDP1ci0hFN9x4ndv5MiRkYKS BEDAA1EQOBAfdNx4wOJphVUVgQYkCTVWCkJYiIjFERGCMGKgGBFLtJeQ/NRakNSk92Yzh5RNHS7S 97r3zMsE30xkir3kkbBPinpMm+HI/7ntDwKp+0eYU5jUIbwYQ7QPtE+A9A/TjxTuLq8TmNaPA4hz X5k6V680TDgNDwQM4aTCwx6JPxOmmKYI2GjowUfdJJgdk+ufc982YDqXeeIuh4lXewdbY2GJ66VT AQiHmip8JaVsSlpWwSiFEpaVsSlpWkYUtK0jClpWgyl4knlAQJuCCEg98BIIH5CoxFH2RWu4BU/O oq0gtD3faC26kJR5cEg4+SOAgWHEc6boqvgGycWO+HoQIf3Bq51WxxekHxpJJJNiAG+KnwQO8KSy SBCSOhR9qCuE/EtJJ1IOj3L6G9L1Wb4x1IyYpi3H470dRrhnSZFih8KFUidjm3Q3QvllkcD8kH1G vbJDPcfDpAcmY2oncL5QPGKH3kFvAYiSED/6MVVtqKQWRGIm4CyTEGZJLCWOTIBfSqKKqr/8XckU 4UJB2RQ5qA==