# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jonas@mysql.com-20110127132307-08gtx11qhcoqpsb2 # target_branch: file:///home/jonas/src/telco-7.0/ # testament_sha1: c94c3703a3e1572488f60775e3c7e888a4a8f2ff # timestamp: 2011-01-27 14:23:17 +0100 # source_branch: file:///home/jonas/src/telco-6.3/ # base_revision_id: jonas@mysql.com-20110127103647-sq4h4033wyf3v20z # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXrtjRAABu9/gHAwAgB59/// fv/dar////pgDb2u+2e9re9JHoAAApp0iUGg1SgoCQpoA+EkSU8RoU3plMBR+lPEwhoJ6NENDQ0A GgZBqmaUZo00TTJpMQGBDBDCNDEDA0hk0waEZE0p4p6hpoNPUAAGjQAAAAAAZqRCnlNI/TKYp4SP KZqPU0PUAAaABoADQ5hNAaA0aMI0GI0xMmJoMI0DIBkwEkgQACGmgjIDTRJkwp6o/VMmT1MepADy ZSltr6rL8Vn9a1PmNOnRC4OlKzXVzX59BOdCgFQMICJJN/1VFYG0xQvtiVAteeweYY543rEso4kE 5XRhWtU070D5GYCwlFpGtUPMZURvwuOlbmesiwSO3fC/WSy5pqwYIK0wCmKGroVx0nMdkYBWRRiL MytFTaeowiBBzQIICFmDhwMwJmGGgffnfg7cx8INa4wDlxHZUo3rEbd6/lsou2t628jYDQNAgYNA gy0KywUTzBC5cSzBtSTTtuFkViGvCZ95QIRK1NBz+sPcHmc8Ee830SisJmdlmphyg1Z7zJxqYQxF 5ZcIqAkGTsosIW+J3bIauwohR78wfIX5mwmDC9UBvEPAY5beoUxnAeyAIAaENXElxamUMugGPbh7 e9r/M22HHYSBV4QRUq0WeRfE42EneddAydvClBFMI12lSFMhrkT4g7cBwQbQhoIgimpYYdWyCAEq I+B9KqACwkwjWraE85KCUpHKX4x+8IT1SLXr4zVwa965y3pNZSRXA4+/F/KXM1+YC5+MPg3ckSZA Gz6KojTAPowqDc7YDEe/iMwRJLapVoUlYhqiZNU8E7bjCbUibo5+lTmss41yKSECqT/JfvAuXVOH FfvrRRkFT2ks9wgdxA7CQdAS7ZG1yz6yIcz28fme/weex3UdW1EAXpn1KjwyFU1qtXf2TiunhOjs reO4abwAjYKARugg0Oq9Q+J8XnWppW4N2G8zd+WLr80VtpzHMUDYIEoFKTjYMouO9ojxJlLaUQUG QJkhTs9/RzGA4nNpMOrKXAa6RPGpcJQEnnJ46aRvIzFIgc6kdYM8pAc8Z8aJuJ2CBwRhXKp1KCCw /9yLiAg1kxSBPmIFI3VVOXGARx03yGlai/jdUc8ZFUQBfudrFBEO0y8ZJCtvmjL4CB5hGh84Crrd tytfNPWZyjIQVGP2SdYMbAN6CDiE3pjrtkErJqC5wziJLda+B4zkt5jo6k32NQlwrNw8oLijFK4d Aa2zbQb6CgSyNMBBL9mxB5ftbU9jdNMl2NWyVTpTNT2CEVDlBl8RRoqlEk+JkIMZnmwvLx01hsCQ uFZYZEVDAdG0fbcAo0EaCZcStxMNeb3iLSk9MDKqBOYkxr+R7PouOR+umzGLrDLFqSBS5TF7amkk E2A7A1UGkgRtpVQolZHkaxwrGhKsvsL9pwkLIeUzDLInnrHGBW8vsHwJFJ2BI7Sc/YoNbF5x5V6z 2NXTjRIWoDm7Y+t2olo25paZ00xCY2FVQ557hQEnCBhJjTMmDgxAeTEiDVK6njfmYLUsRcDtQcHm owOIF5MVG4nOZoSLCFHKAwqz8JuRSnn4Fxaa86nOtFeyzddItKHhNKB50m95pQ3AZZ43Um4tuV17 qXDVEJ4jOj/iXFJOw6BEkeJ4Gabx5bTlRqLL9rYbItFsL4wkTrOgiRfT2HEnJlOKAxSMMSmjy8X0 FhKVaH0WvQxvmQQImDyw8x5TaSV+8x1G1d2ZZV+3OgxsVmVtsHv1CBi0VsYyY2ikyQWk5wJjdNA7 BrKSRqJDy0rJFozzfQOogpmLSNLy9qBGlV6B5tLS4wKCRSnHF604+Jbfk7Iaw01GqAoucQy1viSc cFMBAkWk5BSbBxIgQ1Fg8rjM6iBOTnGdbCsjrqtKbXZxKnlrijMrHiDjlNBZ41GFDEwaIMyrN5SD OFYqK/GfiiRTrSGoEZOSywrw6NOXGRruNW8ofscvciVLmDngwRZhzGp467U8HUYCL2eA0mQNO0QK xE9A26XxX6uxfz2VPiOopFV1cAzcXHRT3klmxnj+ClJ7DNKFhi0QIEwGqSpcMJR+weH0S9PNjIEp E32D9A/MKQj/1qsYTJMzN/yECMA+r2G/LQS8GT6w/MIh/qFVCIh8xOSkYV60odwOEoF8OhMJhEzA 44yOFMnJrf0mF8gtPzCwiReGIPHA8P+2OJM78mc8Z1X9FF5MGPJPFaM0wnIKv/g4BNbuAzJmD9Qc IAwWAjBwpEWL6+sK4XCQHF/dpn5Kws42La6mIldupQSgETiNUTpehTKS3hl0+msJQTDNMnGZlHGD OOQquSINp0nSQS2Eh6nIyktykpOdZ9iclOZk6/hkWrQrtgThmOCv1HAzJmZAyYYGTBsP3kftq0w/ yG11H0HlxJfVJcLzQq1x4gY44dSG5jYmrBPR2DID2BRZBGC04JSiqh7Zjzl0AddnWdPmTKgMDmbC 0Y7jeIOZI8MaT+JzNcJjlWeA42FQW9zq0kmTIGiYecA/YVJE8CCvKBwE+3zK19ytfJMCYAZHZcJB l1qXOs5Gs8fogBrV0FrNDGYcVG7MkajZ3HApPNdmvIoHvtrWaz8yneZEos1JLUuZzHymmgMO84cl 5YdxchJ2Ddv0ZdBBkqU81KdRKmUl+C5dS1ISSG8I2lUd0HhFCKHOc3a7ePJnulu5PCdkMxgz0pQe zcYDQO7SE+/gWnEqkPgYFqDod/EsQUnsvQmiY2MySrzIrWMfQSGQmGSDA+ewy74rqOoIURXbwUbg PADiTehethjbgQGzb7nkHYz4OEVMOGfy/F4itkjkPo5j+o4gf1a1v6dtZ3ncazwVoTpXJV9oYsDo g8EwidIdk29rohTUXACycqAx0RvJKUlZduihirkL8Zp8D17VrPvffrHnHdS03s4lNwNhRGKBy4uQ bZlRrcrXL99BpIUweweDat3T2k+6WknnVszdzIttEu00jiLioSXUeU2La3XtEvQ9dPE8Zy0y+ItY 40IuXqTFY4vKCslU4nAxPf8z2yAt4/gVL+6XwS70nm46dYHr7DrfMsTYFzHNSalXMCAr1g19GQip up8MsAd9t7Lnsh4HA5CDA7+G70OE7MwuLuAB9dhriIO+W6Zw/EYzpIhoJi4+OhzQKfaDGXXmaV+d YDPiH9QGGYZAwd3rvGcG14A1fbopgNarT5YqidyEX6PMythl4FBS/ihfekzyCYc2DL8enZGotYEy QdSb0G4+Aj0PI8eFBSB05c0BoMgIsj3RKDBBmaAGSem7ZWgzTvkr75R5BFSu8KJY9XOWClcI2Wyb 5EeRAeUBDDDBQR5ZMCThEweR2iN7wgiLuDMihJgQyTJDJd41cDwsOhba9UleyAydyeUsCU1Wh0vV cvb2D+/RJyxO9/BK0C2FpjvPM3OLT3GY1PE2FQH2QVjMmZMi27lA936gl5bjSeV6da579j2jFPMG 3sBmm1cr0ngCpm7lRWzM9wjL/gPW8ZjBKpknAOUlrGVbchgrlYHShyw4jUaDEPLHU3lEViNswyV7 9b3DJmEVeQ9e6mfl1uRWefLiXmEikvY8HI17p/UUGiDEyOwt9cN4q0qnYxIMklfUjc7CS8OAEuvq zkovdemDqIhA6TDwEsHjxri2bi+1vLnsaxUGdRWTFQFpMd3ehDGhtHFvw97kmQXQAq9x0C83xAXw V917Mwx7Ukq6hB7bLjrr1iqvLSHYIJ5AB9e8l8bxBxDmTPRmxtXpiKeCtIuEuyblUUp50JZdGEsz 8pAVMg+a5bjf9XAfI1LXbsGVRcTLVZC0ubIR3b5NlMUqVarxBZZfAYZmvDhsU77h3AfzHlImYS8x sXDsa4ai0IglGHasBBgaFlXguHynHAYZpX8QiXCnHKqtVDMB20JXgaNw6F4G/MAAAAWt7W28dbxN ZFc5pySQt94hE4Yqcku+O/mQKPvVmEGN8CJx7H3TdZ/nJv3HXGEiQ4qxeRDgMe8idDkuDZUoVwMD MKSTpCVI6JdTdcnJWvcOTfo5Tm47qAqYF3EedW96fcalmbC4Sb3GOkDha/OmwzBDzGGyjoPneO2O xEnqYHjidkGojtWYg6nBOIHj78dmm4kd1KcojcssHyJ1swmnTZFx+Pr0E+Yq1Gt6zTzypHCOHp13 lJBcth3lBveHqdDjvFcUGuxuhquOrzbNOVG0WFOtNwEHaYrRxSdq5xNgxAoSVpFxkdjU7DGEEBTz KD8UwtMSQXGR30JJWdTcXmJU2EP80MkzRtgdxcc+wZTC7kinChIPXbGiAA==