# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20110201141934-\ # ppx2z4tn6vv0u8q9 # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.5/ # testament_sha1: 6d46ced5b2e4afe9b63991e77fe46e7dc9be2cf2 # timestamp: 2011-02-01 15:19:38 +0100 # source_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1/ # base_revision_id: ole.john.aske@oracle.com-20110201122328-\ # hdrlhd5cgbxq3zgd # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdiNnDEACGl/gHVwIAB59/// f/f/gL////pgDxy2+HRd6ObxnFoaAQF7lBilFd7Z3d6cvQPQA66aPWsJJJTJsmRPU9TTE0aB6j1N GhkBoAANAaaGmglITBNNJg0gAmpqbamU8SYjQNAAAAANJpkJop6mmT1MmIaNNpDQAAANAAAAIkiI Rqm2psmlPTU9NNT9UeUHtSeoeoHqNHqZPUGgZBkHMJoyNDQyGEaGQ00aADEZMgGEAwCRIgCZAAKb TSZqNBT0GTEaJ5DKeppoaA0ZhE1vE9SRScYUPGUWKZUGrFA2hVdyhsT/saNBMNVSWgXybOjBmEP2 /z04+aZfegZz6R8MphYJ2vh9YY780HlitZsWOJxQitRmeJ9EjDwnnMhhMh8oktt3DOfoyOAoXZuZ p/f8vHXMgBeBgpGaLZWj5vQ2T0cGa/yarLytGS4c/v1snf69GjwFSVQ1nky2FmLIWOMCkLAGSTKL Q5hktKBlYWvg3FdRiiCvd4eFqM7FDFRgrRaPS6M1Gl1R2yo/zbaP7OYuAtOnlkSSJtJJECtQC2DA kIN/eBn5VZOn7ZqiJ9kE8Olhl64r/Y7u6uzOHrBjDQVfoJaSvuNR1HElzIzULAUYRUheoLSXaV+V YFspmZmBmWbaC5NZnyMm10dOpk5SlBGuuI75kMz53l6ywEqwOGLS9ALcHFUgQLkLaJcVQfVSqWk/ QTKRL9WA2J4kAPoSx5hpGbATFBlzWCXYWDUNiTBX1BIFQUSN8wqDJKp7DCYYUgShEDxVB4NYM6UL yhgOJETIxQpqdx8h0ozd2sqPS3AYvsh21P7lRGXUJZNRTcAsYHg22tcyaLQ9oglsSgpShckiHorC oVJKfW7QVBnBJ0/1mprV0KrUlOyat7mYHAPzFlw2uGtd5JHWK2PqxoVYGh45Wb1vtPQFxc2HRLXm APJ6oUvTxSN7LrX24ixissK0qZOt1Z2OYf1PZMINkHrNFlSmma6uWFM9JzFpIPzBM+sFIkC2Apkw mTCYKYDGM3kyAkM8wMTC+226HmFOeXZHqdWmDWyc4qmog5psDccTZLEShM1BhphCao2qZzRKSslS v038HXp0dXePn9zbWbrdpucw2gvObCEXolSRqVJDwgbbHPzbK8EjJvwlyVyS1qq/LyXKjfLukQkT topkKilBBhBh8eNkOYYMD7SCQgjGJH1EhI/J2tGTfCVvsaROejHgc7MOB1mBAoDeSPSMDiWBsPcE yYxkFZMO644UaLh3C1CQAb8RmCfP9ErLBJ9tYl3ePe14IJ7DItIFwZCMMioqGCxpiKHjj1nnKhxE x3gdDzBAA6xpgcg8QNw+4Ljizq7Q5GLcxDceDXGRsYrbAV33x23665lPsIUoNZ3OMcvVLIgMi4hQ HgCA3oDlTpINxiFFDQNA4BJBk4zxWjIZED1F1YtYvvJ93dnWXhauS8P5BShc2GtujZjtA8hPWVRs DoVhbwPDIuKQQxiICKAYlOIJ3nZKsouHwJkiy44CmpDKvpGSlWM/cRnyi9YdZBW4ErdIKCgGCYvX cWn4MSg+dh5TZoPIykAcoHqJqEIImohHCI16oBAFyXdmm1zlGcyJ1oToVMCIxD7sZF4O8KRWcO6V nd5yRSI85lJGK03EsVWQUa5i1nMVFV3GZPKcBLgDIOJzGDAiBSJgMSWYEaxLVXo6wgCwNkbMxu3l vAsNFTgLQrOdvBitJnlNhkP+M/iS9wjet6BpErdgOSgNLJ6XAuzeCg0DATKyk2B1GoNBSdZQIcjl qNtWFJdtovjGZv4/RZvPQf9DabRpmOtSGsVpyxIlhNyA6wZzNwLaIxoCgCkOTOjSWq7ZvmGWO0nI 8E5B9oc6hheCzsXil+5bt/8I06wNYm9xYZR4XnNoL8wnN90V4hu1GnroSLSQWEjp1iyHMZuLLJTo GlK3kx44iGWSpJyOm6TODVkMbEFolC/ee2cu8QiVqvs4iZg0wLokH5ERxOh5+ekwpawmo9RatK1a zkuGpDUWEhdRUSGuwVQoUC2SwaS4JorKPFLaEHClGFsdDyRaSaHUIS2FqKC4GC00EVGOZqYFYhMq UNwHx3PLerTfsI349yrqxx4Gw10x19yzl6TOyoKXrtovDFT3LBqkRrEFOyW4IiV1v1LVf2OpzXAo +6ihJE3QeZqpzJA0JZtBi2MlWmk6w58DoLgFm8qFsa64UCA5EIWISpgY/lFrfJiUSRh/CI+i+ES4 tAH10FHjPzd0WB7IBAIQggQXcoAsQF4wCg+0A5Jfwl4mSoUBACUrj9An40BiApU574HnAGwthAqC FQ7oIFSRCRqaBAekEfYALAu6IDrNYuYApv3lAsBAIAwIDM1pBbtgB7UWxAN2QGJKX6BgjecAvrQH eALC4j/YUUNEKkIQ0Fwzn7utXALtOvAcm+ieoWzYD1gHgDOqUlNiWUQaQNymAXCW+dJgXgsBK8Eu AFYlgkqAokLJUCDuBgMLRK43BSJcKcNIlwoEAsgUJLgqSBMG5JkD46ia8vpOBzdIp7seZ+EUlCkH yglQuNSvvwbrgYfQfIkEnICkD3+0sn8PafgYFR8sgFKZjfgfNoD35PWXFIP2e6ioVq9n5p1q0Gan +KeCqjFjsjW0cJ5s62C2+JRh+hXTm2Q5UC/Bk7IWrNDF3SEx0SnlXxwJlZhkn4B5QgYM/E2n4lp8 eqpzH8T4kyk0hIZYZlQvlOPZCVYM8ALRyZcczKeAynMmREdpadY+Amclx6ux6TSYhZZU7CRyAkym ImSQGBuDYYJ6iIFBr60qR6plmROHUW7jjMVztIbq0wVShKTCFJ6k1QWbtpYbRlBn7QsLERQoLaiK qOhWkD1KNbzemMVtYNrN3PEPKFErTDgHWAyAWLlicU2HBmiZP7b53eGvZfFDdBbySEyMHneRpGwi l5a5ujRkZfhMdZVaEmmxsbJki9JBVhrpPKbWmsdpFluvuimKUQDWNuWL0IyQmR1GTcfqAYXsStQN QIlGM0FWm9btsV6IX1nUdkqRVxxpvizIWQ26Q2aPgntf1RqE17nBxBsxqnRjMmQM7FtMbGFUclgV BmgGfBzgqhJN8PEyBbQbCVRai5G2wgI2ChiAKeUH25lcHcTF3nlAPJalUdQkZO8yj58/CLqIl5bd nTrk4tUCYyKd7mZnrZOREZQQ3zVeuqqoUPmknCwNWDNDQ32GQtqEdrExG+KykPEGbv62LjSeO/y3 4JbusgaYnkHBEYkeICZNdwVhAlopI+jpVQr8MtnC+QrMY4MhoELgVib3E/iQiSD1AsGDQEBesCCY hDfo1WArXwmmR22rfn8iWgjdQWdvVcEzOUoNFTPpISDaXYkBp2QmA5FhtEk3wJzwSR31E4TyYpXE lOgiGvycWvEmJfccNcXA00xthtFoF3AEup7gNKjz0mk+F0wDBPX9nJAcrf4QNm76zs9R5TRWQCYo Mw/kY8mgMtwkeSwgU+lp55eYwWlDdyYGkkFAsxPbO8al4xIqXcZ1Uffeu8mgKkBIWNqCjwPmTDqD ADNVfBYyqExdrKZgQBiZYUlgYHbLlXf30mIDx4EAFGJCmUDhFi4R0pJNAXOeB57LB2WAPCMEXTh5 OuBYseKZIoSmFJuFAiAI0WEMmoYgqQEXCGsR0JUXqFKqAsWE5tQyYnS1OV1U3IEXsnxPFtfd11yE SPGtnlLLTsMRQJGBCho8KxYYk1lPbfv2AbCpNJ7fdKgluyo1Kj5fqIXWJHgF+h5gaj0TLEwC4YYD NF7GMNzR1TEeVldPUyDaARoEfugNAqpHTUoUhdChP54oC48nX32HHDEVN+SwtfwIIWmepBZtaaGe 0mGKMdh0D0iZmKjvCvUP0x4nd0VPiEVeTFFeWMXVYgNZcIvDVee8RxzakvLXeYmc6GEmJqUKFxYi 03E0kccTWVzYqhwNscMz2cBUZCn3mE0GMGSmA3p/2e7dAWl+6F9IPKmZ5r7Lw1c1ZILRWCxduZ79 WwKakL0Z50VjkSqvRVnrqgu1n4b5IZIYqlx6JSspiDaUpWAFm/hjXWregRj8867NvE1d9t1GSRId zaFaaDYNgYiNTOtAG+5RDVpKygOPBPBSlKVl4RBBovZ2RG5rMxWPSKSS1EgJZPeWascpepO2UrZU J/XTZUFWSLKa6GM11SpWAHMTAD1DR+CYxiPnC4UBcgDYliO0ILcguB2atFgsoBegWB5xPkj9shzK TJSrRFbsHJy1pdVM35FpIQPalZJLwtI3Z4gaKKV91ldJk4nRAaiViqVXUe8ReLgwqFpVmki2aSyS RLKvGV4EzV8BD5j3UqimGOjhN7xTJhk4jIwLtECNPlYo3xp2c3JV/A9BBQbGNWAZ8hidBFRuVO0g KVnIJ5vcosPEeM7dgmnEJiaDNG54iuwiljGtJZ3jlEy36C5AcAaXzZQxPQQLQRQQs5MRnNxqzGXi rJeEPZYA8MhgpQUqxWJj/F3JFOFCQ2I2cMQ=