# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.hansson@oracle.com-20101230104555-\ # gv2akvezxhaiw6g8 # target_branch: file:///data0/martin/bzrroot/bug58165/5.5bt/ # testament_sha1: ad436a4c0b6a15fb65a50f69815314ddfb941b26 # timestamp: 2010-12-30 11:46:55 +0100 # source_branch: file:///data0/martin/bzrroot/bug58165/5.1bt/ # base_revision_id: dao-gang.qu@sun.com-20101229052252-\ # ohzfrfknpqtvhmcw # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSVvA5MADWHfgHlwWff//3/n /sC////6YBaKdz5mHeHU0eKgU5M9hyhW7dNZu4uyNOhHRswCyz244ASCiIUKVQikAfDQpoZCnqaG TBqflMo0aM1NAGjQAAaB6jQSpiJpgQJqaJpkYjRD1NNPUAGg0AAADTQEJRNPKeKP1RpoA0AAAaAA AABIk0JoICJtEZCeiAQwyTQYQBoDJiHGRpkxNBkyYTTIGQ0BoDTJoYATQGCpKBNAmIwQyBDUzQmE p4p5TRtI9CNGgPSWGAgDMiAcwwZdlq0qyRS5UGZrnNljvBU6p74loRCOuT3uQQP+R3+DLgZqoJ+n 5f5/pmKKI357Cb4a8aupsCLPphRDAKvTDUss7UnMmRE8ZmkRPVRWc0l1bN+aJTbL1ysH36z79yFU 4aDBhAVDxi49Ad05hRvHSHVweNEBVJq+M+SRLcwNXw5RwaihNE4hFHx4wVdHLN+UFQhNF46NYsys cMZwbOrtu4QAb8Wk5IyhQWrK6zhTMA5Cqpm2pg5C7PSzKgvXCgWG9OeY2hu8nN0ELaY5utaEWqVI kqUpFUlcJuOP0mafzX2T/AqdT2VzjBVOrR5abOVNan1J/UnAlEbbGxtJNpttNg2mNtC2Dj96Qp7O 7zeEfBUwc22IM1ijkY4uRDxEYcd8L0Uirj0Q/RkXckEiXUMLKKqzKDa8NVoZgyqaLmiJZRDyzFL2 AZSym7BWK2uynbvBLEoZh3Z7VeHIwSKrDyztMPd6IcYWcOFdXtWLO1GWRoisOYwWirXgTCzKwWKN SpalELZbvUKS5JYuy4UYyFYN+BbEXKKxFsHYttB36H+khtw4AgVEMoO3eAyBR1HfzRvvL+Z/UWXH sVbL5T8CZ7Q+trLt1+wQUr6ExL/3q9/drF40FNQ55BzibohOiVfGMuVLQ2R0PSLRmRJq9mEVzmJE p/XeVJu3ddSuOE7KroRFgNdzWGB1nf0vupt/fA0qiH4ziKeh0Mnm6GeTNLAbL3Ru+z4vQuE5Edrd o0a500MF0IsY5l4qq26t4J1fY4BdYgzTcyVlCQjrYK6BCuF8NYvHxlYHR643G7NHhTjcSmcK5il3 2p9rm0bMe0M8y7KekPuY+xbwFg6sM4dZO0SRBwKctt5Ql4rN5o6vLda1epR7LKCSUolmcihmMlSy RsiQ0jt04sWGmkGZ4xGUIyCuNkDmHMPH2tpl/aUYNkbywbNja15fOWh9d/bb1+Pp/mhGusJC6Jgk /pG235Af/utpknWaCZUA77wrJkh+D/R0hCJNXvPFwmCM4CD4kfNQYmuipv8X4pxnjOF09TVrwx1L /p6b9L9Go55x5DSPlIk756x4/nj+R6JthMrzDmsYfaLLmU4GbUyHvl/RRuZBmDwZDioXNPCy6lmT steu9A/LHFnvzM0y58xv4FTtbYMNgsdBogTSEZ8nRGGRVFGEiMbrk0LzGxYZDyTyncc59igFrpmK IgXw+QY222/HuO/y7p7o8nx5OuwCu13syaw0iWS1VlGQ82mxQxEshiuxNpZtTKgLoE8ZVAyAMwPh KaY6h20jJIWpcWABiQpEEgDFQBiBMmIwQhlSpq5zHJ4sl3lAOqod5n7md/QMAyLrIo1yN2htwqWN 9S2PUu+MprFNC5G9BNXrd1QKhIDM0BSWsWlTSrK74TKtMyxi+/vWNGffCKDS3taVgypu1JVWLZ1b ZhtzlGHtaCjLFIw2yxaHe1BWVPdN2qQg9sdX95OZggAvpAApjQ7A3NjQkZ5sJMeGcBXRMRbGquwi 4cqDrKrgcI40KWIdORG8p0WcGHtzYXYwLODUTHGMNJScLWxym8F9ACQyKDI4FB9DkUUgV0dDTTrO yTahIzY6kVTTRBXfnK0ghQbrOp+yjqwmNTrUera2szRfZLHTohOm92hS7msZF8lOSZSbGZnpsyup 6+JM7Vub3W7eHLC/ETgsdpHGsDPYoaNXH0DUFZo0aKrFnlzKrS4exRrzGYAxpCXaXNZKI3E3vW2p aKA2gg0KNn5g7PQjVXSlPqNxoEE3tYQigN9VjQdMrnAoi5mQEVQJ7FzahToZWO7LKjWes7JivnAs xwNSwM+6PPyItqRrMOBZ1glOCCHmPSx5t5dwEtNgBblDkgpIUuPNnTMAydQmxbm65hueILgewCOz C2ptxz0IcWbPBtIzZo4JBBl5BUMWzN5jXLUM2GudNOcIFYYBDbq24NADaZskGJTi920abj54eB03 kfBXEpWNAa7S9aL4oEo3ZLuRInSarAjkHAe5zCTY6DoDWl4hjQWyNhErXclHFMh5Ax0NSZiGAEUS Z3BcViIUMyReggf7huBbvCvEDrMigRCRXIxPQZXzhtwfBEeg/hzh0h1L85ssq6IFejAGrkBuGUrJ FvKSdaUAjkCRxnPlHli5nQQTlOOFB86D5NiAPOglAElqyDJmOHiKaJFDAfTVi4LbgtcbpHMypsUL FquqWK1pNOhaU1tzoZ1+Z2mV/Y0N4w654Bg3DAGCIdmUpX30do5OaODao9IPewrLxbWCgGZ4kVR1 rOsAdNCmmM3Szfal3EGJV07J7sCQXkHcANGTICoVL57eHPGut6ADPA2AMDYw0xwRXbCS5Fz+Wqcq S5WbYwCtROf1eIEdd+pjfEuBe162zm6mSV7c65h5d66E7XB7ad+exTHU2fD3Z3l7A5D0hIKV24py ZNqiwzXCMXxWCLGEU4uU32mROBWpqVL4BjE62D0VKlYHBmVMXKhZDbGQ1NyaeW3wDnDMGZkMnJYM XR6zwO1JeAcSd+ta0ubp1Njzz7mOR4BxeZnjMORn7O1w6669MjTDTO4rO8us57To8WwEAoY42Vgr pE2FEXxjVc1NmKF+3trUsULnaBo6cCz7FWMOYz5y1tyvCZAVOA8yIDG0R5HBOFtCkhFJ9OhaQOuM AKCF9jIu8YjUwCBqWE1Hm++ZEduFF8ImxTO7yRCq5K69i1Bgh5nC3RIQhIGxARcWrZd1wN5YDQpf gTkgVUzW22Mq62G6kRpUxbXLFB8cigCdkSJMjRmQKtBuGJUotEKkkJunKEhOQgKGZYZBStRiZBjc 1sSNTVbzaDMUyza2DJBxtFaUiUBgsrLA1xNCuPI63yKIFcnPTwoYYzI6tibVhXMHmkQtx1jMiB59 M83u7tADIrczSDBcoUk9aBMw8jPu4mZlOhegZcjtDocjWFzGhFBGMCMxuZ7871knl31bYKQCguzj UrpA0jYUgUjhdDzF4qb6IVBKpAAyxAVoxLCAvkM+VXYJtDaZ8w43M+QS6HqJKsbTacqqqKH2JtpK hLDtfQnvcXzyuMZZEZ7k2wpL94VPYNoPrR9qPqJNxxBsYwY0xDb/eL8a1Xe6lBQqoaPwk+0NBi+s zgVPxFf742klYIIMPSYPvD84NWhfkuP5B7BYFmWCpyIdhEahwRfMJLj7OCr/Yy3nEnbJi4wt9M3Q DD9VGndFyUxsb1h0Wx/CzWzLtM3/w4pFTk5EtJ8ZUFfS1ekfL+Folx5Evn3Eueqfd0U1WS5Unz96 W/FboD6qJZ9T+58zSaFtq9T5Ok71IFDvUie8ivEO8u8o54jtdCx63lis+IbfCQbuw/fxhJuWunK4 Om7fvOBjMsH4mrrD8zkkbQ+/vKffT7q/TDfIzqXJojElaFxoWrEeSYv2XyIx/cYOSbizkZjnxZZO SUpErH2L8z7jekIsV6LNTJMGwbzw8jS626caWN3lGaisRnyeIg57qutcPflFwO8gdp6uiR2+duY9 YfUdlDA4gnnKt6wtTA8h4zqAQmeYZ5IXQqLyimMyz4H2LtbBmPSm7R4nYd01NWOcunh6NLUerjHh jfyTQbm2ZuOmT/uoncd56QnuuPjEkbj4KGwje1O1XdtWqctjwXOeKrMjhw6ync8GLS7dR4Fy2LaT bM72e8nPbg0upnZqUphW7I2FOltXsMjq1flU6TE0ZsHiWITsZNlVEk8Fjto/Suno0Wz1lWDNJclN 2C9oncfrkxqieEo12lhmsWUpUpzp0kqJ1a+Xgw7S13vB0u90MO3oknPJkamkO5ra8Xg9Tz59DNjq RMzHBOyaLHWHkuCanOxloJxRyncOdBxuJgFyQNd3mzKVCvpC4ZbkC9XDbyuij4mXpymCj+NnhVgo szvvB8jl4mFk8em+d6q4wbD3GHjyrTdv6Y4CBWYLidR5jM5yU+7TEh4TbxnAPIdljMPL1Xvno2bI 6aOsZhbZe6Hcw7Ti2vUvU5rWxkJyJuxyVVCyiz9UjrJ0QezdnY8+ujv3mzHHk7XmsZXZODkZ0xB2 iT2uBenUEMUNfcokhRyINaZHnQBShMiNBrGkXnJO6Dx7Kd2PT1aIB4wq/IE3duHWW8Ow2qnUv7DB +7hgGC7V8rJp8IfGgXLJnmrHIP4Mv3ZsSfhHnEwD39ItWF5zNNLRiayziWSJ9O3pQ9Nnz4moqgbN QFSyhU+I9xb93hzLCGaKoksgxes819MJJov7rUKhtOma19aUTLHXnZA2TZX+apSyrK5Ce14NynWt uWO/t8Fi9aT4TmyvczKsXLG5kPPcnoyMmdpZ1q2LlyS1URYdDYk7oj4nIWn7E+ZNJOqjumcxR3XF 9T7VuFp65Vy0j5FqZ8IGkqSLPRae87Q44GX7ZJMSzfSkNGeWx0Fesy/bHizmh1DSzXeJUmbvzDAO J7HbU0lKFjQV7ST2BevkRd+9Re6H0dXbih/pRVKqSqb8DqMl1KKxmu1kryM57jhLDHnFrdq0Tl4J DOMJm/BbMj07FuUs7XPk+SJTn3F1kxf06/SQy9B516VmCB9vQsZhgZ7bUCiQjko7UBxWfZOOeR04 FEbNKe91dEhW674wLyDR1RHvHnKmaDUZQU7c75MZFUVahw2dp9jWUo/dnvZeDn5Heb548g9pl/XO ky47D3Tz9T8Ojka3ritnE7ziv6jb8aef2XJHHONbjHsgsnXMj0Yh1vC69wX12WFKcbCyXLUdI9hl QwbVwvJqOk1sHdvOM4aiZEJUJ5m5veus1cdW3UVbiHvG16jcSI/iyJOAaIXrCoSJLmEnEkXjHY5n Ys2XL40EktO5reMXLif03RHKn83nJSdaKWSUlntZ0x+pwmfoJfmjeytS+nzwnJ8JuG07DQx+waY1 pWhfpSVoF6SeSZDbxDrX5lQyy1gY3BEYY9F55hlUImHUmg2LmgokIgu0CVg3ApUL37IFlxMFpShH xDRRAVmFgPXHu0K6IJVGIG0JXEw0FXyaH06l7B3lplxyFhst4zWMo6DSvjPEitKypJbVooUoP8f2 zzA6MJLGd2eHl3HZZzq6j+NSYp61/cOzzPga4sJTP9mEas/C9gMx6ztmB/1767zJNDdnsiSfnRw3 qTBRFkQhkHsfqLklolkL6Ihcs/nvejtEb/EQJoCnhlskrZvl6qVTnbvjN8s7y+TmaNGYy1n0OWbe d+up8JguIcMOqK+CiUF8k+mHTfTu6hpLTwx4ZKrc1XDqmzhlyTUy8MzKknFh5GJrve40j0OlvhOK 1gdbfIno2DsaCyfVN8cBqWOBsQoGDGA2S0oaT+YcKUM3Ay1iVVCWSVBSXtZzmS+tO/rxWO6W2pKo OBqrr1taRRd/W9/8sH7ZHxti6vKO9eyJNM17iN0AcojbfVCqxCouPElKy7wJAUBkqAzwGOb5fx0a JorNo0PxWnjSaYkX6H52SOw0mGen6zC9Q8QDbZgdYhqSFPuQc3NStJimRav1Bsd2HsfNxxbWl7W6 dXmWXZOSdJdLXlVw86Kp2EtbphtQz3LyfR0nupVIu1NkSNp+JPyUpSlKUpSlNmGsfBcsKUWHUXxI olVOmDCdBXs/taTEXSLJXsqwnvm207s+gkveQTr3AV7fT20dDKftmHM9hapB2H1BsrSJG6oQHAyO GL+pAuAEaH0mx4LALUqAmSpmhTe1d9N4ZFrV1fBqU0YndTIF5q1CYIoblRNFy/vTpMBKc5LCGmZr J+AyLq6HAqJCDTX07KQbzcHowW0Eu7uC/NAVF14KCS+hpjQ2JtsSbU5Gi2VHO6gBipVCXyL3Q6w2 F9QmH1tOk7B1GWTwdE14WOLWo7SluT6qnKI/kUaTCNbbHyZUk58bIWiaaTZ6uOJg3s2Vm7xLHYXy qnpePIoMvvLdIyxd68qqrT0z5m8xZEv3H3hvZ54Nhgh7D1F3wPLK1ZIb8lLQ+PWbZ0HE9tsn41tz ldpbmNsJ4mrx0+Su/JYtfKaJ1nsOlTgafE0ZGUz8zkXdod0s0l6xE7Deep34VstmquNt8uVdMUpv 0dsvhNJeZdp42eq0wyJnv2szuKidW1YOqwlivCb8/U/SX7WGEJ/L0bTgtwDSieCcXckU4UJAlbwO TA==