# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20110323114930-b5penovu8ti4vb7b # target_branch: file:///Users/malff/BZR_TREE/mysql-trunk-stage/ # testament_sha1: 24bb00a9186e7cc44ad11c2b58ca3094e69501aa # timestamp: 2011-03-23 12:50:11 +0100 # source_branch: file:///Users/malff/BZR_TREE/mysql-trunk/ # base_revision_id: marc.alff@oracle.com-20110322120100-\ # 21yh8d3fce4m9nnx # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSc1GMYALhNfgEAwUGP/93IC EAC////wYB+/ce+nOjN18XekvTSALrG9gHXoAD1Q0AAA0AoAiolQcKdSwDEAAoABTsLAwlQEk7ay 2BJBxgABoAAyaAAANAQJkzUIggA0AAAAAlAmQgmgIUNDajCBoAYIUoTQptTU8jJk0mCNA0aAAJqo iZI1DRtTTRqeQNBNNT9U0NDAVSCaGgCICJpkJ6KGUyaHqemj90IiP/cRCIbd+R5hIkQ80lJB5w8v iaAQUFANlERARlPl79vKsPrEKqkVbSNJV61l4Js0xYYpvNSlp8SxF7VMYZZdo/Eu8BsCEqIgMYrD OuVZc2eGUHZ3dQZrKOjwwzWfI0sjStMTXvzrEVHgqvPpacsI8yGwHRVvVvF0aSW+JWxLGFWENajS C6tLbfl5s5RwQFDhdyq/JVdVVgoIIkJgJSAhICRGgUhUkRCUkQEpP/X+5fbdJaDIXFxaENrYWSWg sNRuM4QyvAiD/vPPRImaFCtCDtC1lpW5SDSyA02ciCVIUoUpUFEolOaIMBJCSQ0EoEoLCYSEhoJD QSvWc5JSylPGuKTGDEXFhjBGKTGISIxQkhjAlEQYhIK7iuKu4EBzYBkTkYaQhyCAggOAEByA4ImC kQKcNxTBThpljCkoEgYAwBdBCcLU06s7jqyu6iqoumc8defo9HsB/P+cfn+PWDGAeWKqtryzAt43 47Iy8n7sdjt17R3s02V74fD2pXd3W00zTIrQ0zFWmjlDoW4sJSs0rIDUQmRWWk2Ad4iZmZAAVVAA AAAAAAAAFyMzO/uxGZnHEZmZqldVXvZITGqcNOis50JtAyDWtKzpgnC5ZUR1bLDwlMb2xfyNc/BA BFVEEQD24rwVxt8+rMrO0ySKRFVVSNpmZGOpgq9gdYHuCD3n9v/hJZ7zfR8oxRE0kJH/Yo8qiSJj +kbBBhhhuoA+c8WHwEfEzq9forNPaKvDXXXMyqNMrNQzKwEsKq3EAPSbnn7ffb0+/+tWUTr54HwE aQ+H6wiIkxpDP0absPjyaIhDQ7UTenh7sHpCBHccQgR8rPVv3uknZtgnXba5lS7Z26BmYerTCqen LDU+tDTbkDYHo6sSivT8dM89M5yz21K4OkVXEPUZ3BDxgXVCUiQExE1MEENQkJIVNBSRTUjRLXjp h7998mcvT51tF0As0ynVKQlKIghJJEJRAQKQpJrxeZEQiEosKQBCkCk0qJ5vh89A5kHQh5RPHoaO x8D1l8QiHs1SnAhEtkQhbIiCUss+cUQhwoyXdtim7Z91FWepd4bqEQaqJsWy7jdmowSlREIStEQG CThdVRUrnCIiWiiOFlllV2zhk3SbrIxyWSxZlUzRg5cLLUcMlFVGjabSSabdKO+7OG7JdmasGC2v TpGSjJhm13ZJuk3TAkZMMlMiIMlVWzRnNpAM4k2TUXdKqsk2TJkzdM2LV110zSbsmGGSi7NddV/L dZ20YtnTRwos0ZMGabKdtHbpmwUKIgnafE1Py6uzDSae91p0ic6AQK5CjSAiIDAZuPkLTaRB5LAT Nhwh7zY1jBtDtWke83AHmHE4HMju638RFfkYKJsNScRCHtQ1Ig2eU4QFFGzFxV5xTfdOi58Pz01d M0TibXFBCKKtuuLWiIQs4LPZ4QD0RF2vHs6juTw6N9Y3RCGagiByGzyIkchjkNFqw/XhSq87Fidl Jdtc+m0LZ6X14lMnjMkaa6lsuJxdoU8HmJzBOUlctJa0LPa6Rsxed1Gzkyq6ydKJNG//IF4REawC ysZqvKIQm5XQD/962YuFnlk28y5WPVOrZsOklEijQI1Z3llkzRGcIiMVUINUnJqwUu7asmJVdV6t c906IsbRimySbsD55Xz9tLSpt/VHO1d4REXdFnL8ery8tuHKez2k8YsjJ5aGr0iIiOWSyjN5YMGD NZJgs7SSYpNC/c02Kzw8PWERHtw5Yklkl03hwuu4Tavm7dRs2aKOXbRJoaGhxOw/0+o2dTpzO51t EyRpKLmB3wHMEoEkR4E4JDXDbFlGcpVllTAlu+v6Qg462N2YCwJbXnt7pu24d+KK5Wtm48Caeari beMGMSzViImlCIjl6sHT0aGsb602jyxCMMpTZL//0Iy2llmgEtnbNCLtzRyz4NG9OWjNsm7dYprZ Le61FtAjtNw6UYmjBwo6cxprSSETlPZk3dNldnj7XuasWjRdun9GUN6t3Lw4dzUy8SrLPJoaKUbO uqZbMFmKTIkp0+ssogNUB/KIQkxcJJPLpo2Uejy2cOG7w67lgwTs2cMXBd/Zu2aMU2jF6rx4TJNG TArNo4XadtHbBw1WQj2Qiv1CJsn+SC3Hs2ptjKSl51r8d8Co2TCSZG4oJDi6fVtK6RpKVJoiI60p pfx1ZKI2FUQhuvnEAlCTBk5TYqJN2KZogGksL56cKpqMyyTJV7KVTZREBJ8SohErMknd2az4ttKX jY8GI6DkHBuiBAqAmygkSPBqOXtDjeCtiyiTl2zXUWwfaeeHbB4MmrmLsGWr5ZvDU/1amRMW0YVo PBRuupoM5YceUOA3H1cZtQa8acMmMKyho7TiJpZyiJrtHli6XZuGydGGSSTbTWfCTV0ok0dN2byk 3WYE0majJyqokzcpOUcqtTRsq1atVWDp7arMIuzSbvdB/onjrteKaSiUenQ6EkIlC1443Yzndx16 ujT1ZQyDpqxiLsudoh2Ryls1dsIgNU2rwaERjpJoui219qmiXppRTyuxVaoQwpJaUMkkmrVJu9FG QPAx2myNWTNZ0ksVeGLMNsm2LdRixbr7VXDhsmYpPbto1bu4gpE0QhZkq2TVWVgjDnw0zasUmTKa 7DB2ZKLEby7NFE9KtmyerZANW7V4d94tEv7ZtQPK7tN4NSzNy7dqrqKH6BGyyyabRZkkwO3apsmk oxbNXXVKJN+Wi7tJwdcNnLBy7No/1/CIQ+UH+H1QD47+jfv53RCRERIcCQiQt8YdTpjkw8W57t9W zFsTrf8H7SRCIlNm3WaZnsuVgRVws0pvnvBi5fWqzVpEQ0usn8sbx9X14cN30ZL/wgKfo6feO++y HMdJZKtlPDhoSSUaPCi6BQWctV3hVkZMHRkqzRCOm7hohusktCIietV11FeEklXCTA0cMM4Hjxhs k6cHlywdOGK4Rko6SdsHSablRViWJWM2Cx216ZyVUdqKsHargybJzWUYsWCa7lu0aMHDFqo5aTVb Lt2y6bFkxYlll2yqr/H96HSAfwEdIIwZ9SQfR4wnPvwkn1v0iFESkEkQSRDKmMViVHcrHRxBHowc EnYQJu/QsSIghsCszy6TNGbQJIjTWWto8sIREcuX5XaMGq7yxTN24VWCOUkIzSUdKtumq7MOcxkq mlmxZ3WSVJLqMIxs5TYt00maz+L7sU0k2Ro1mm9/eUtGjVsoek3JEMKa6MU6rtmayrF6MlS7wyXT bqrPnSAaMk3HHbVg0UerVJNu5UVcKptWbyYs1lCTZ6KpapeV1WjFswTatI0TKOnarFwxddWYt2jl R7IR/Tyo+z8mMEePKy99X8h/OuvWTw12oAa05yXa3PuxgnQEQXEGbtm2qmwbJKLtnqvOW6Pcs9sZ 350aGT3ShJJs1bM0m2MEcT1UZHv78uGjxnJKjZ2wf3MLYdU2UbsU93hgkmwWTwlHTJ21dqNXaLrc GmHmEQndd48cvDNwuzT0apxV5eGrNimqyXZuWbRko5XaOGjS8vCyqSrwzZJNnD215gH8MGh09E3L dJOAbSAzVUjNJws2cJuEklXC/bdkq7aLL3asFmrFRum8+atWpoxSSVSdOU0kqpcMGqrdVNm6mRSd /KSfBOENImkInCIKggzTAuuHWL3IKteX6YJ1IMDGhzLiwMSMbMcxb4MtWuuhpRJdBETJ3sp1Lm5J RwOYJHaTQ3GKcJFNC5sdetg0VcnUkzcwYuFsrbS3SUm3Tf0su8NmSSUTLO2zo8LG5RqcGCxRY4Vo JLmw6ScjUUyQYubW8XNlVlGqrZNVutulVgxYsTBdwkxbm66TRuk4Xama7ho0TfSJpqtmThJmdsDN o4bsWzFmzfygH6vmERHw48Y3Q+AiJDGNBX0WEaBn7Ed98LOX0L8ukmTA52JNDsUbqaDGD09LOKhn VuDS6CIDkHgyUUSLJNsk3UZMsX2z4QC2CnspJLwlJJdKMnUkcocZFBVJHOfO24sGRpFLnApJNjs7 ts2UZcpttuijNld22XYQRy2brN0nSTl0k0ZP9sm7/DdR6MW7Vg8vPmrFy7Pom8MDJ6K1Sso8llnb fDpik8sGKT0aHbBZu6bMlWDPdsktg66ryzcHLFk1fZCP5j6b+DiU5IiJ4zRF5HiRGusscYgNKASw kALe2AA2EA4b30AA79w912ExSRIFLQtKUE0iFAfRVe/SKQAoiIiIiImZmIiKqCCCCoIIIIIIIIGF 9r3/wsRHj1hAi+kRGMgiUAk/zP3fhBp9eEk51YZmWaCGaMaM5hV4fYA/gBxAywzMssyAxCysrMsC AgMzLMMzMz3W+uN88J4SGJlR1wOebgDCGPBm348sFWypGICICQgIBhSFaCuLEU/1QdIi0nBDi40O W9ljDl9d5uhwVFbpVpMA/EhKriHBFZCRXUDBmCBI2RY9L7S+ykP2fh/TNgk/dJJ90Qh+F7v3fh3A NDA/dSIiI/dVJVg0f2arpFGL8MGLBgqxZOWTZNk/f9cnDl/DdM2YZuGqzti2a64qMXDZswSXdpsS zFPRKrhyum6SLKpqF2h0k5SSZrOOMFlXLVywTdPMCIMZylq5arujBI6b79vPL+hJm1waOXL4ERGL Vik113V+v1hAj/HiPRyuxSct1ohB6sU6ujVM6UYvMnu0ZMXu9lmCjy9DvxzlVhVXMJ67rp90qeXz Bt3iKxIXHa/Phez+d0qclVXFKvqaZmPEJlVWe5iQvzpeCqu7Hu7se3t1+lXwicRER9fL6J1fZos+ y6blOuldW0Xfj8Yv2CNmbE+E3wq0LtWpNgLrOUybBi3Ub74uFv2S/Zuwau12Dw00xTnKWh/dANHC LOGrdu1cuG7V+iAYLrPLQs18Kt03Zg4uswZMt2DFuukxZu+8VnqRi1aulm7PPNyqyWbtmzyvezlZ ouzbrFXSaSbwkxat7uWLBttm5ZL/q0ZKrrKOWz+vGQiI19lUQh/uIiIfj1dhE4QI0d5bMF3Sb2ei 72YulXqxeVE2yc3t7PQuo0aNHPNGj1WcOnLZZY6c7OlW6TffV0s6LKLprrLqKF2DVUq2cqsGBRVj i6XYsWqjR00ct01WzZo1bptWyzZdgo6cLseFWrRRskq0Ymj8ohCyjltoyYtHujBs6dRs6bJMGMCI MHT1UIiIWPPnezquU53Hx+wit+7Tz2Sp9jVKm3je5D8iCN7I+cfhuiEJNPjQwvpHt5Sye7Jmjwwe yaj60efRjhV6t2b5YHDFZJ8tXD/p4YKukk2ir59uFH1mloTdOG67Hp5YO1F147XcMHDsyxfTBo1X ZN27Ndo4duGr2gE1lGS67Fyo9YBdksk3efPhw8ucjU4dKNXmIiIipFpJShERw3XeU2++q7Esoxbs kn0ibB6OTB5eW656LMVWajJbjjtks1eHlu+vhRyxdmv3dZ+d/ClKR03fkD62/Px78/hCIj7RERHj Lbip/B+xIRIe/3hlDAgHum0eE03h7MGDXX+pvh9mWTywX9031a6vh9nWTZZmoUZPhyou4VTeHb0t EeJIQ95EZrJrRtdKbOXhLfluzYM02TF5cngzYNFGabVd4VUYs2bdZ5s3SeGDA5SVYk1i7lw0brtO UsHCjhsSZuVG/vEQfcGLPGqrsz2ivXjSlYxSxUmYEiCcaQIgkKRIhwzXTMH6fryu5fOGE4hB9PZ6 PZNI9WS6qncpcNWz3f9fSj5JLjHPn8/rNCVKOxzOhzKOSR7LFClHm/C5oN9/Xd7qu0J3PnB5+nlj j/3N3CK71Ve/e0+UqrlrgH6s4sAxIZVV+lnd1fHwtNUq4iK9vvzmKuIi6L25YB8+d5+nGNpVbzxv vIaSq9NXdbVVfvgDjxyXToeq/IcwSJ6HqMff7D3Hgkg9SRz7DY+03NCVJJs139n8KMlX6t3C6Ro2 XTUaqsllWCr6sGTduYv3fu4o5Scmuai7t2/RNTwrJNrruq5YOGiTd0wWRJy8JwgRUwT4eFGTR3E1 HDFRiyZuOMXEXerHdFU8Dw7drKKtW6qrB0m8wiIxKpLAXe37/lGTVgyejd4ejOECKYLPuB/mIiI+ 5/tEQY+AMcol8vfrkRWLu75OrPDerzTNfjEh3hPh9rhSrRhVXK0QyE3peyrSTuCaVd/z91H7tOVV VrEvrtnq4CK8tKtaXCxA3q0IuxQknEkA4c44xERESr9wP1iAj+oo9rflAaVoBGUX/z9OsbREHaA/ lmnqgP6IK77Z9PM2IXz6LN5Xhe2JdqH2k1RGWo+iEfR81T+EQhKEEfhygP1cF/rsfBD1Sq6/2ta5 08xrcXiVWiVMA6RWMYBjGCVh/W0VO79b6c6p7a+lLHOlYB8rNButryqmCq9HVxq6uVy677eylTjc GeYithFfKVX8XlVVgGfpq63WIvWD79Cqt+28Pn5+G+1VX1vfrcOmuWAdtW+WnLbZKvMDsuQiu6wQ tuFYlVhqhrYaWkDfp0eMuREfiNEA+QjfVjAIqQJShERESjCOrFI/wiEOrLVIJEfxEgixC8iEy9fV rOqrxvVFTx6eDCqtJp0QPphdHVjwr+kqemVWshWO/vx9e/UqrsQ64jwgFfvHkI4COHt8vr6P0nER ESgGYHhAKZw/eBEG03OfPfbTk9PCEeAj0HYdSK8E0MO09p7M8PjSFV0FX9zBdgOdfmTKVZFVffjF T41FsEygYkDv29wO7xEIgkl+vwft/w+wRhwQr9N9/lr6Eqw2xtmKtq9mAaqqaCKmr4NB5cg8kV2D aqkYgIgJCAgGFIUoFXbr5JyQFDbknlv177Er8XLU6MKNQbyq+2VC1v2ugD86vr95fg+0PMRhqPhE iJ6xGqUREROqEKcuRVNU1TVNU1VBVUFU1TRRqu0qvnEA3AAN1AM/U+Qjz5+Iq8QO8DDUdf0Pta2y zCqwjHLKYzHKfuOo4bA8AALd8kQPmKrzDs7KqkqqpKKqqTEzKqkqqpKqqSqqqqqqqpHgqgP/DyXE fplMRBrHtr9cQJIiIifHyiEKUHEcEe0ohBf9P+UAw92nL7N+0B+vrNKSgVeedJ1lV5wiu0gB2+Pk PpNjmHI9nQw9ogB5eoiqiIqqimIgvDUiEPs99Nvy2A94+g8cq3MiB53VVez+aoB6x6EREXRA9Ymg Pd7oBMTPu3bj/YI+3hEIXIH0ZvVL0jtOIiInEQiHCcswicRERGE2LyiEJIBtHyPVCN4fOr5XXZNv VJ7PUiIh+jeERHwhE4REa87hs57Q+gu5IpwoSBOajGMA