# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@oracle.com-20110329004615-462t7fk7gmxoq40b # target_branch: file:///home/cpowers/work/dev/mysql-trunk-wl4896/ # testament_sha1: 6111b90b2f8da2c4fe49e1ca19fd71df13456cd0 # timestamp: 2011-03-28 19:46:22 -0500 # source_branch: file:///home/cpowers/work/dev/mysql-trunk/ # base_revision_id: cpowers@tma-1-20110328233710-el7vs7os5f3xtw77 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfUo3LsAEMJfgEAwePf////v 36C////6YBUcNfPt1ouxlvuaQuzR1yorpl7tuwHYYDNW2bQoFNDChQqiQCqlapgpUcAwjCaYhgEA yAGEaZMmEYCGgyRkJ6kmmnpADQAAAAAAAAA0oYoyaGRoDQNAAAAAAAGgCRCETIFNqp70Kn4RT1P1 R6gB6hhp6iaD1PJpk0mgiUQCGpiaammaAJiZAImQ9TQeoAAAVJIAQJpiBTTABT1NCAZGTINNDJpt RvP+B7z3ikM+XJtdPlfm7npCObsmVPUphgnKHAQM2Ay9Sva+3PYeJEJvrF1JMX/hiQ1oKt8Ekwm5 7oVDFv28znkhaZsu4caeTvR+YQAX45iQGqYJklxUuPm1pW02Q6cGdEGpS4YoxaUIULFqpRDgTQsI KGlObyohQqprBUyEKQOmSRQ6CVLTgOk+0iRlBYkjsNgcQaioRVEVSKmtZoD4funtf6rFq4oDjGTh UffD+Kl1p/Srsiosvb3r9kP9obQRIRjEZASSRSQDy4jf/IA9cB036Lg7GT2T5TKujxEAGWRRTWxk j5oYTJ1kpywibxheia3ImIqihDWY0FKQvICHApGgoUYTtyao0h7cUisI02FI2WhHJaLCIWpayNEw RMaJeWUEg36sS2rgab0mlwZMpphjClbkqw3fSdrNmw001NiM8U5RMaVeyKaM6xDyKBFjUkhShktQ hjRbWxrSHbDvFhyS4yIMcOD7hbvlPm6T2doAUGeIEnEBLREwj70mdnk5lQD3WeggBmqAfGo36PGE 7EsHNJZJKX+5Abod//d2Mek+ELZ6pa1rU0uMb5ED9F48Bngg5G8v7opBvRYFdbJoRMttmg4xrClu 9KB2aIKuIM0SWGFi7AhH29nf3R3v0HojtluoX6/gcBTzbpqMfvQPZpbz6HYeCSy4QhSCv7OlNwkS JFAisTiToTglglUqlUqJeoAWDBRD6R7AjCq8nUPGm4QAUHeM5xFdy0U9rs3ogeooGmNtgMpRUlKX Y32Y6OrQ+js4PJ4vJ6M2hr13fn4FDCowyHfi7kE5zqGO6HHCAXFomwGQGCB0BcWRNCA14sAgp6jS mYpnkR5Tg4nBoHAPTqtegdoc3+d95mdAa+cNfOvEecN/NgHfJ9vIu08ra3CPJuyYvkjmmaysdMua 50J7IYYd+EPQ8BhHuKcj8AiScVOd1rUNogBqVOeJfAZA4RLYVilkE6IWxaMaRkuuDvvSxqczAxIu 8JgLmFpLTSq/lGjS9FKapGouYst2L/lAYkS9F0x1vSXr9lC9Kwexs4SUvgXr3Jp01WYWSLM2eaA8 FWuimjjrfOO6MJTUbNFmcXxxjOKkYTZmuSMm50mBW/QFxgtxbeWdaadoBWZNKA/8ZGasNMzqs7pg WEAFFxkoIpRPJaGK/lY3htIMKtSUzf12mwipAYPc5/Png5aiP287IuTdht3zmlrm27wdnhoxGSNW y5MWS11/hxz6b76uz04gceoabFl1aOVJY4qVstEtq9Wu1dApmdsz65tWSxwyzvVjslXDs5R3Lmm6 zm6OsWau/Ji37/p5eTNfHdHy+Xe+qbJ31S56N8aRwdoepI3MX0nk6PTNspi8vvun1TZ63o8PDpFT hndQNDbQGkAghYJhMKQ0BCRPEnqR4BlSaWCwVBGJQiOJBJMEamuzc6ON7Ttm+6zhm40mTFdk2px5 JGBNsVI2qIDaUXFSyjfkpRu0s5LokWNAc0NGZ3xqPIokJYNDRapkSLQLGZkbtYqM488ZqS5Ae6S5 4ve/95dVJHPjMu5LLbqqKpSxla1JNx2WSOEHM4pXU4SaMzRGC6d0z53RyZ97KbKGEUkXyZ4qL4pe 88M72EaM1pMmOziul6/JLJutgXR1WjocWWHhyNrpVO/vjRgs4Lly5a5xavBuMe8+02cdYW/gRDN6 IN2dm5rjNxqlfCISPxEjcRjHkaY3Wlrd/Row2vW2j8EBrswYtIy6U4PP6riX6U8EOUyMtK7LxSYL V5hSjWHKQNs5j9G7c0ObwVHaOEX8a9EfLZ3Obss1545XOuTx97c+MnvnXieapThn388X+DITLJAd OJ0ZY9GTvKtkVx29WaOlby2ZfKEeQpE60HAi5dZlkEo3yNt87FuDRBsHJNzSEYC17Gw3IkaNUYRt GkZXQ8XXF5r2ilMXNq5PwMPV5bZTln6kJ2ImAhtWWXahQwhBYC5U4Z3CAOJE2BSIi6hK3LdQUoS1 INZgMb4KWJdZVuSUTS7TffwcGXRrF7XHwdvuzZNHNdGceO+R3Nndttwcml+grGeXIsVbgSVpGuSL LIXwnAuJhrocOBGRD292tj04RjA9iNBnGcvKXlPB0SiUdxuk4UUW4dhrnTfns1jiwZt0Wjf1kdlz OYHB0s5MF1cunS03O3N2SPvSPUdx54dG7jtaeLld4Xs6yY2mK3Q7avDFZdltdFoo2WzZdl+EeeWD VveDPXVdibo8IqNoz8bndsdW4peN5pOr8H1n1dx1ZZpxsVd069GN2TcuyuUkZJn34jK9hjdFWq5X WmM1fBs0dmkaXry2521suXXb7VW9ez342XR1YOvV1XLOzJeyW5t6mt8cIqN8WhmnEm1MExTFL1dS YpUSxKCXpYlyYiLCvCTxU4yaCFlZ3wspEVaUh5O4i4K2T/I5j6DzkepEqinMSUehdd1eyj08u2Wx xa0rIhQouULPDduXpER7D4jPeQHwJPcMZ8j6j4nwDXiB1tg+iOSCIUwNjY22A229x+72oc5P1V8J gD8Xe5qNOpVRQpS9f3Asln8VJ+fsfsU0Up+14P1v3t2KyXNFJvkgegNDNen6o24Of5lZMYItq/kD 8fWs6LNzFg2ZJyZML9WoOTZvWkgc29nIk41EavLmuukgaNE/m1kgcZIH0QGLAe0p/SCKSGmi55OS fisl7k2BkgPxUl7oo9N7CMXUUpDEFJ/mP4p6J3J+CRIlAQidvj2wC5KHcJcC/V9jRWoJZ5S+EIQY 6lNFZJLkiHm0AgD7EeKIDUDIRAaQksaqBUmm22NskkjgJpPzjUFvvGYJSoV0NLv44oNVHE2oMonL atJuhjlTCWxpMaVCu8NxFDbwfom0JisvliqSlFroS4VFCpBx2fgkiBiJkYlBLxoFqZpYmDqTK0kZ OhZLVlVMgNuZBukyjMiG2MoRxRQvV88CF+Rg8EqtySPWNB6z7DpOo8T6T1/UaG0g3gcc+cfZPYgL QmT2PTxRMYvPXmshyeH8Png2gIGw/I1HSMtBiD9P0zW/tQDlV/c9moQfJIaeNRRUpJKE2yfefOv3 4zyiMoLCTGN4trJAvW8YtN1TOVB4UiX4bo9lkf2P14vWTKVDe9vvbLPa2e65m+LP73wnuXP3z7PP NswauD6STJlHFuyaNnBc9yl6mq57jbvbDQOoT7DRRQ2fLkP3ruPaIB0/alPqKO318bKeue6ep0eL o+59Ofm6vJmp5mTRs6L2PBbRm4Je0fkzWfSfOT6I3FQPW8+S4T2O5b5+cfp80k+zxRUPH8ds/eJD 1x8lXomR8Td0hLitcT9mEfiui0U98smEPpDqCpVQ2ikYo+EnEXqXp0iizs8fVi9r1Ok/qcvL0fV8 mC5TN7/gs243rO6RtIrguYSFIVYMdm9Ph0PgcYdp3nqKmk0Jf4lHXpUKcpqPDjFzDijt3QdppFt1 kB9maA0kgelofOM8F8fCNo/NGSLiM2MuYnqiyJdGg483kdHXJ+c2nWTpTbMRMQdh0mZXWbTgmPdH LafaGEMfGkxqWzuZyFicZYM4TMqMCXJ6Ny9+RzUh2qSBxa5k7RyP4I3RrdLbYSHdb59u1eG6Q4Jp s28Ovrrd7j+dz0J1QaonR7XtpXUvjjI6+wtD8xJdUoSkGCUU7jAh7vo6eMvKpv6tNXfYaUL7W8uV ukzT9cUYQfbx3/dgrAAyutB5mS6KyMlO5WlKCbsLZm7gcwPtFAMEIg4MRoC+gL/oQbkcu80JknKI AcaVUMn2Rz8zokLn2+Lvfd+H2fNdde/IeDB82OP0Xs3Fn9px0bvynaeZ4lpaXieTzieYfNDrPNCd CG1cRSrsyDoUu61AhviboD3jZZaLuOA/Dpap5ll9VQxN9Src5q4hxCnEbi3N6HB6zq94zwBIncDu 5u8sVcrXWCew7RzPK1BvVPy971IrdwYxSfBPHhXj8Sd3IhXvNOOaNXtSS8P0ukfd1g6EyEQNnXVC 4pQXVBCSsSRj7yBD6Hjww+4LxMwNbIJ9B3qm4HtacwJuEAO0T1sA3sV7ckd/jwE9Q3ra9WM50WKi G09cfabh9tQbaaB9B1dgaUNUeLrsA2snxcpuG+XNY9ym9AfOFIpiiVIWVyQMgcO7Q3hxqgFjXp7e Cu1LQO6EIwuKReU1lmSApHDnzuh3IjdNVJCBCGA70Ig9CgdjwAWjwDMcnQGYoW4WCRB3oUSJjDpM rAFzwuE0l58U2imst+HdNmQ4QiZ0KTAildiLihpBA3xkTBKkkHsLZs+0/dGMi5Da0zuLTZNJhpPs 2ZtWg0RFRctMYoUiwtVgpVPruGrbBQczTV4eooHgvoHSFjsGDaJwVwTlSgnbFGCC3N/DSX+IPEWA 2quQp8MhCopZgYJTo8hTP/wjUGgoRPCKdEB+IaDl2XpqUo/fiAGp1NC+Bg926hzguzuiEU7LhP1J uSKGXoxPLvkxQKDwT2Wzwkhqa3G42fNU3oQbvmG2mLlCTIU3HIP3nr67NQQNp7vb4sZlCkSVoaE4 UffbRC2Ctwj2MBtqlriOhB6RAC99R7tgl6JvEv6+dkbRDyVy3CcUhd7upMOt0+KeSMUvSKJmgSlo KUQ4JUWwBYJUbBApyqRUVFIsio7RZtNJI6sj5HVjexpHEAIlUiRIkSEEAiRIlIzm6M9/CL/IsRlw jvJ0vhmnR2pVK75J2lI1yRlDcOzp3VIvhqfdOY7VLrxNRSOgOAVFNSZtAWiUYkaK3fjwzOtMmOKu jrSebIXXklWBZgx3aKpVLl18RBCQjiHIEwRkvVfmoiGQDITUDiIhjVGCA6MSXRmJM/0PF7YYjlkt ckQMRgsiFMoaGVZJAEqXYZAWggnvJcF0isVKlVcYrLqTU+D6z3pG9gYVUr7lmed5US+WSFiSja6H xQxvhS6URaEIQgRbk0icyt6AB8ixXD1lAdaaKKMTovaVtNnYnIIU+S0TicwTNMOG122i+o1hcmY+ iH5jYjallBIQSQVOyCAFEqm+ihlBBzVgliRSlgLyBnqTnUMQ+I+LpXv1IB8OQPGB5mImtesjeK6J Jwi2K0j1EnGYduiLo0i9ZBwUOZ+fIC6mCDqQ1dlUaCdx8Q1tnebA5Q1ItqAV+TuXXqS1o1NwcHQd ltEsGJCCAOqRQniV5IDW1IqvGSn5VxaEbCxWIwS80tUHMBqlA2Gh7jqF7TL3vN2Q//F3JFOFCQ9S jcuw